From 3e2e5ff60fb190d8c64dd82a7a1c5b1b68e3171a Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 24 Oct 2026 19:12:32 +0000 Subject: [PATCH 01/12] FELIX-6872 - Dependency Manager: remove AccessController usage AccessController and PrivilegedAction are deprecated for removal along with the SecurityManager. Drop the doPrivileged wrappers in the core ServiceTracker and in the runtime InvocationUtil. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- .../apache/felix/dm/runtime/InvocationUtil.java | 11 +---------- .../apache/felix/dm/tracker/ServiceTracker.java | 14 +++----------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/InvocationUtil.java b/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/InvocationUtil.java index fb4456ba09..55581f8d06 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/InvocationUtil.java +++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/InvocationUtil.java @@ -22,8 +22,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.Proxy; -import java.security.AccessController; -import java.security.PrivilegedAction; /** * Java reflexion utility methods. @@ -90,14 +88,7 @@ public static Object invokeMethod(Object object, final Method m = clazz.getDeclaredMethod(name, signature); if (!(isSuper && Modifier.isPrivate(m.getModifiers()))) { - AccessController.doPrivileged(new PrivilegedAction() - { - public Object run() - { - m.setAccessible(true); - return null; - } - }); + m.setAccessible(true); return m.invoke(object, parameters[i]); } } diff --git a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/tracker/ServiceTracker.java b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/tracker/ServiceTracker.java index 9148a5d005..55df178e50 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/tracker/ServiceTracker.java +++ b/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/tracker/ServiceTracker.java @@ -15,8 +15,6 @@ * limitations under the License. */ -import java.security.AccessController; -import java.security.PrivilegedAction; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; @@ -259,15 +257,9 @@ public ServiceTracker(final BundleContext context, final Filter filter, this.context = context; this.trackReference = null; this.trackClass = null; - final Version frameworkVersion = (Version) AccessController - .doPrivileged(new PrivilegedAction() { - public Version run() { - String version = context - .getProperty(Constants.FRAMEWORK_VERSION); - return (version == null) ? Version.emptyVersion - : new Version(version); - } - }); + final String version = context.getProperty(Constants.FRAMEWORK_VERSION); + final Version frameworkVersion = (version == null) ? Version.emptyVersion + : new Version(version); final boolean endMatchSupported = (frameworkVersion .compareTo(endMatchVersion) >= 0); this.listenerFilter = endMatchSupported ? filter.toString() : null; From e4cd9a122039c7b068d869b20e0a9545e5d7d7e0 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 24 Oct 2026 19:12:49 +0000 Subject: [PATCH 02/12] FELIX-6872 - Dependency Manager: Java 11 baseline, bnd 7.4.0 and Gradle 9.8.2 Raise the compile target and the test runtime execution environment from Java 8 to Java 11 and the bundles to new major versions: dependencymanager 5.0.0, annotation 6.0.0, runtime 5.0.0, shell 5.0.0 and lambda 2.0.0. Move the build to bnd 7.4.0 and Gradle 9.8.2, so that it runs on current JDKs, and adapt the Gradle scripts: locate the bnd workspace from the root project directory, run Apache Rat (0.16.1) through the Gradle ant builder, and do not fail the plain test task of the bnd integration test projects, whose tests run in testOSGi. Stop tracking the Gradle build output. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- dependencymanager/.gitignore | 3 ++ .../.gradle-wrapper/gradle-wrapper.properties | 2 +- dependencymanager/build.gradle | 8 ++++ dependencymanager/cnf/build.bnd | 4 +- dependencymanager/cnf/ext/libraries.bnd | 2 +- dependencymanager/cnf/repository.mvn | 4 +- dependencymanager/gradle.properties | 4 +- .../bnd.bnd | 2 +- .../bnd.bnd | 4 +- .../bnd.bnd | 2 +- .../bnd.bnd | 2 +- .../bnd.bnd | 6 +-- .../bnd.bnd | 8 ++-- .../bnd.bnd | 2 +- .../bnd.bnd | 2 +- .../bnd.bnd | 2 +- .../bnd.bnd | 2 +- dependencymanager/release/build.gradle | 11 ++--- dependencymanager/release/rat.gradle | 48 ++++++++++--------- 19 files changed, 64 insertions(+), 54 deletions(-) diff --git a/dependencymanager/.gitignore b/dependencymanager/.gitignore index de001d36b8..43e206aada 100644 --- a/dependencymanager/.gitignore +++ b/dependencymanager/.gitignore @@ -6,3 +6,6 @@ /RemoteSystemsTempFiles/ /rat-report.xml +/build/ +/cnf/localrepo/ +/cnf/releaserepo/ diff --git a/dependencymanager/.gradle-wrapper/gradle-wrapper.properties b/dependencymanager/.gradle-wrapper/gradle-wrapper.properties index e65df494a7..8364c22200 100644 --- a/dependencymanager/.gradle-wrapper/gradle-wrapper.properties +++ b/dependencymanager/.gradle-wrapper/gradle-wrapper.properties @@ -20,4 +20,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip diff --git a/dependencymanager/build.gradle b/dependencymanager/build.gradle index 71ae1fde12..8219eef85e 100644 --- a/dependencymanager/build.gradle +++ b/dependencymanager/build.gradle @@ -20,3 +20,11 @@ tasks.named('wrapper') { jarFile = rootProject.file('.gradle-wrapper/gradle-wrapper.jar') } + +// The bnd launcher based integration tests run in the testOSGi task, so the plain +// Gradle test task of those projects legitimately has no tests to discover. +subprojects { + tasks.withType(Test).configureEach { + failOnNoDiscoveredTests = false + } +} diff --git a/dependencymanager/cnf/build.bnd b/dependencymanager/cnf/build.bnd index b5144dc788..fc975a5a95 100644 --- a/dependencymanager/cnf/build.bnd +++ b/dependencymanager/cnf/build.bnd @@ -58,8 +58,8 @@ # # Java parameters # -javac.source: 1.8 -javac.target: 1.8 +javac.source: 11 +javac.target: 11 # # Removes some headers in order to reduce binary diff between same bundles that are not changed between subsequent releases. diff --git a/dependencymanager/cnf/ext/libraries.bnd b/dependencymanager/cnf/ext/libraries.bnd index 9148780069..b5a801065a 100644 --- a/dependencymanager/cnf/ext/libraries.bnd +++ b/dependencymanager/cnf/ext/libraries.bnd @@ -53,7 +53,7 @@ webconsole=\ ## # bndlib -bndlib=biz.aQute.bndlib;version=5.2.0 +bndlib=biz.aQute.bndlib;version=7.4.0 ## # mockito diff --git a/dependencymanager/cnf/repository.mvn b/dependencymanager/cnf/repository.mvn index 46d73cba8c..0c8d0e3e50 100644 --- a/dependencymanager/cnf/repository.mvn +++ b/dependencymanager/cnf/repository.mvn @@ -16,8 +16,8 @@ # ant:ant:1.5 -biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0 -biz.aQute.bnd:biz.aQute.bndlib:5.2.0 +biz.aQute.bnd:biz.aQute.bnd.gradle:7.4.0 +biz.aQute.bnd:biz.aQute.bndlib:7.4.0 org.apache.felix:org.apache.felix.framework:5.6.10 org.apache.felix:org.apache.felix.eventadmin:1.4.4 org.apache.felix:org.apache.felix.gogo.command:1.0.2 diff --git a/dependencymanager/gradle.properties b/dependencymanager/gradle.properties index 35354fb51e..a36e805284 100644 --- a/dependencymanager/gradle.properties +++ b/dependencymanager/gradle.properties @@ -17,9 +17,9 @@ * under the License. */ -bnd_version=5.2.0 +bnd_version=7.4.0 # bnd_plugin is the dependency declaration for the bnd gradle plugin -bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:5.2.0 +bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:7.4.0 org.gradle.jvmargs=-Xmx2g diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd index 9d04b269de..9216cbf839 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -Bundle-Version: 5.0.3 +Bundle-Version: 6.0.0 -buildpath: \ osgi.core;version=6.0,\ osgi.cmpn;version=6.0,\ diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd index 57c6346496..a4dd40d2bc 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd @@ -14,8 +14,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # -javac.source: 1.8 -javac.target: 1.8 +javac.source: 11 +javac.target: 11 Bundle-Version: 1.0.0 -buildpath: \ org.apache.felix.dependencymanager;version=latest,\ diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd index 48b9256ed0..bd299c32dd 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd @@ -26,7 +26,7 @@ org.apache.felix.dependencymanager.index.itest.tests;version=latest,\ org.apache.felix.gogo.runtime;version=1.0.6 --runee: JavaSE-1.8 +-runee: JavaSE-11 -runvm: -ea -runfw: org.apache.felix.framework;version='[5.6.10,5.6.10]' -buildpath: \ diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd index 3005063c94..600cfd2e54 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd @@ -26,7 +26,7 @@ org.apache.felix.gogo.runtime;version=1.0.6,\ org.apache.felix.gogo.shell,\ org.apache.felix.gogo.command --runee: JavaSE-1.8 +-runee: JavaSE-11 -runvm: -ea -runfw: org.apache.felix.framework;version='[5.6.10,5.6.10]' -buildpath: \ diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd index 118cfb1551..2e4831cf42 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd @@ -33,13 +33,13 @@ org.apache.felix.dependencymanager.lambda;version=latest,\ org.apache.felix.gogo.runtime;version=1.0.6 --runee: JavaSE-1.8 +-runee: JavaSE-11 -runfw: org.apache.felix.framework;version='[5.6.10,5.6.10]' -runvm: -ea Bundle-Version: 0.0.0.${tstamp} Test-Cases: ${classes;CONCRETE;EXTENDS;junit.framework.TestCase} -javac.source: 1.8 -javac.target: 1.8 +javac.source: 11 +javac.target: 11 # all tests are configured to assume that dependencies are required by default -runproperties: \ diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd index 604546bb1b..c5e5ca3fc2 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -javac.source: 1.8 -javac.target: 1.8 -Bundle-Version: 1.2.3 +javac.source: 11 +javac.target: 11 +Bundle-Version: 2.0.0 -buildpath: \ org.apache.felix.dependencymanager;version=latest,\ osgi.core;version=6.0,\ @@ -26,6 +26,6 @@ Export-Package: \ org.apache.felix.dm.lambda,\ org.apache.felix.dm.lambda.callbacks -runfw: org.apache.felix.framework;version='[4.4.1,4.4.1]' --runee: JavaSE-1.8 +-runee: JavaSE-11 Private-Package: org.apache.felix.dm.lambda.impl Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd index 239126ee5b..5927e12365 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd @@ -34,7 +34,7 @@ org.apache.felix.dependencymanager;version=latest,\ org.apache.felix.dependencymanager.runtime;version=latest,\ org.apache.felix.dependencymanager.shell;version=latest --runee: JavaSE-1.7 +-runee: JavaSE-11 -runfw: org.apache.felix.framework;version='[5.6.10,5.6.10]' -runsystempackages: \ sun.reflect diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd index 7236438f9d..def3055b76 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -Bundle-Version: 4.0.9 +Bundle-Version: 5.0.0 -buildpath: \ osgi.core;version=4.2,\ osgi.cmpn;version=4.2,\ diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd index 957d03bf5e..46c403552a 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd @@ -24,7 +24,7 @@ Private-Package: \ org.apache.felix.dm.shell Bundle-Activator:org.apache.felix.dm.shell.Activator -Bundle-Version: 4.0.10 +Bundle-Version: 5.0.0 Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt Bundle-Name: Apache Felix Dependency Manager Shell Bundle-Description: Gogo Shell commands for Apache Felix Dependency Manager diff --git a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd index 26ec2d9672..69670ad170 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd @@ -34,7 +34,7 @@ Export-Package: \ Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt Import-Package: !org.junit,!org.mockito.*,org.osgi.framework;version="[1.8, 2)",* Bundle-Activator: org.apache.felix.dm.impl.Activator -Bundle-Version: 4.6.2 +Bundle-Version: 5.0.0 Bundle-Name: Apache Felix Dependency Manager Bundle-Description: Provides dynamic service and component dependency management Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt diff --git a/dependencymanager/release/build.gradle b/dependencymanager/release/build.gradle index db781b0390..abf3c108f4 100644 --- a/dependencymanager/release/build.gradle +++ b/dependencymanager/release/build.gradle @@ -44,19 +44,14 @@ ext.svnReleasePath = "https://dist.apache.org/repos/dist/release/felix" apply plugin: 'java' apply from: file("rat.gradle") -// Add bnd as a build dependency -buildscript { - dependencies { - classpath files('cnf/gradle/biz.aQute.bnd.gradle.jar') - } -} - // Configure RAT plugin to ignore some files rat { excludes = [ 'rat-report.xml', '**/.git/**', '**/.gradle/**', + 'build/**', + '**/.keepme', '**/.project', '**/.settings/**', '**/*.iml', @@ -82,7 +77,7 @@ rat { // Setup the workspace Workspace workspace -workspace = Workspace.getWorkspace(".") +workspace = Workspace.getWorkspace(rootProject.projectDir) task makeStaging { doLast { diff --git a/dependencymanager/release/rat.gradle b/dependencymanager/release/rat.gradle index a15d798d87..0a572f2baf 100644 --- a/dependencymanager/release/rat.gradle +++ b/dependencymanager/release/rat.gradle @@ -20,7 +20,8 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.Task -import org.gradle.api.internal.project.IsolatedAntBuilder +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.Internal apply plugin: RatPlugin @@ -28,20 +29,24 @@ class RatTask extends DefaultTask { @Input List excludes - def reportPath = '.' - def xmlReport = reportPath + '/rat-report.xml' + // Directory which is checked, and the file the xml report is written to. + @Internal + File baseDir - def generateXmlReport(File reportDir) { - def antBuilder = services.get(IsolatedAntBuilder) - def ratClasspath = project.configurations.rat - antBuilder.withClasspath(ratClasspath).execute { - ant.taskdef(resource: 'org/apache/rat/anttasks/antlib.xml') - ant.report(format: 'xml', reportFile: xmlReport) { - fileset(dir: ".") { - patternset { - excludes.each { - exclude(name: it) - } + @Internal + File xmlReport + + def generateXmlReport() { + xmlReport.parentFile.mkdirs() + def ratClasspath = project.configurations.rat.asPath + def ratExcludes = excludes + def checkedDir = baseDir + project.ant.taskdef(resource: 'org/apache/rat/anttasks/antlib.xml', classpath: ratClasspath) + project.ant.report(format: 'xml', reportFile: xmlReport.absolutePath) { + fileset(dir: checkedDir.absolutePath) { + patternset { + ratExcludes.each { + exclude(name: it) } } } @@ -49,7 +54,7 @@ class RatTask extends DefaultTask { } def printUnknownFiles() { - def ratXml = new XmlParser().parse(xmlReport) + def ratXml = new groovy.xml.XmlParser().parse(xmlReport) ratXml.resource.each { resource -> if (resource.'license-approval'.@name[0] == "false") { println('Unknown license: ' + resource.@name) @@ -59,11 +64,7 @@ class RatTask extends DefaultTask { @TaskAction def rat() { - File reportDir = new File(reportPath) - if (!reportDir.exists()) { - reportDir.mkdirs() - } - generateXmlReport(reportDir) + generateXmlReport() printUnknownFiles() } } @@ -75,7 +76,10 @@ class RatPlugin implements Plugin { Task ratTask = project.task("rat", type: RatTask, group: 'Build', - description: 'Runs Apache Rat checks.') + description: 'Runs Apache Rat checks.') { + baseDir = project.rootProject.projectDir + xmlReport = new File(project.rootProject.projectDir, 'build/rat-report.xml') + } project.tasks[JavaBasePlugin.CHECK_TASK_NAME].dependsOn ratTask } @@ -87,7 +91,7 @@ class RatPlugin implements Plugin { mavenCentral() } project.dependencies { - rat 'org.apache.rat:apache-rat-tasks:0.8' + rat 'org.apache.rat:apache-rat-tasks:0.16.1' } } } From 9c70143d71b0a5ecdeb16ca95b3ba90126a3db43 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 24 Oct 2026 19:12:50 +0000 Subject: [PATCH 03/12] FELIX-6872 - Dependency Manager: update libraries and adapt the tests Build and test the Dependency Manager against the framework 8.0.0, Gogo 1.2.0 and Config Admin 1.10.0 snapshots of this repository. Update the OSGi core, compendium and annotation artifacts, JUnit 4.13.2, Mockito 5 (with byte-buddy and objenesis 3.3), Log and Metatype. Adapt the tests to the newer APIs: implement ServiceReference.adapt and getProperties and the LoggerFactory methods in the test stubs. Use a unique configuration pid per integration test, so that the asynchronous deletion of the configuration of a previous test cannot reach the next one. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- dependencymanager/cnf/ext/junit.bnd | 2 +- dependencymanager/cnf/ext/libraries.bnd | 31 +++++++++++-------- dependencymanager/cnf/repository.mvn | 30 +++++++++--------- .../bnd.bnd | 6 ++-- .../bnd.bnd | 4 +-- .../bnd.bnd | 18 +++++------ .../felix/dm/index/itest/tests/TestBase.java | 25 +++++++++++++++ .../bnd.bnd | 24 +++++++------- .../api/ConfigurationDependencyTest.java | 3 +- ...8_TypeSafeConfigWithDefaultMethodTest.java | 3 +- ...dateMissedIfComponentIsRestartingTest.java | 3 +- .../OptionalConfigurationDependencyTest.java | 3 +- .../apache/felix/dm/itest/util/TestBase.java | 25 +++++++++++++++ .../bnd.bnd | 22 +++++++------ .../felix/dm/lambda/itest/TestBase.java | 25 +++++++++++++++ .../bnd.bnd | 4 +-- .../bnd.bnd | 8 ++--- .../bnd.bnd | 24 +++++++------- .../bnd.bnd | 4 +-- .../bnd.bnd | 8 ++--- .../bnd.bnd | 8 ++--- .../apache/felix/dm/tracker/TrackedTest.java | 12 +++++++ ...ultiPropertyFilterIndexReferencedTest.java | 12 +++++++ .../test/test/TestReference.java | 12 +++++++ 24 files changed, 222 insertions(+), 94 deletions(-) diff --git a/dependencymanager/cnf/ext/junit.bnd b/dependencymanager/cnf/ext/junit.bnd index 129c585689..99bc945e5f 100644 --- a/dependencymanager/cnf/ext/junit.bnd +++ b/dependencymanager/cnf/ext/junit.bnd @@ -15,5 +15,5 @@ # limitations under the License. # -junit: org.apache.servicemix.bundles.junit; version=4.12 +junit: org.apache.servicemix.bundles.junit; version=4.13.2 test-reports: test-results diff --git a/dependencymanager/cnf/ext/libraries.bnd b/dependencymanager/cnf/ext/libraries.bnd index b5a801065a..2bcb86467a 100644 --- a/dependencymanager/cnf/ext/libraries.bnd +++ b/dependencymanager/cnf/ext/libraries.bnd @@ -17,25 +17,25 @@ ## # metatype service -metatype=org.apache.felix.metatype;version=1.0.4 +metatype=org.apache.felix.metatype;version=1.2.4 ## # log service -log=org.apache.felix.log;version=1.0.1 +log=org.apache.felix.log;version=1.3.2 ## # Gogo bundles gogo=\ - org.apache.felix.gogo.command;version=1.0.2,\ - org.apache.felix.gogo.runtime;version=1.0.10,\ - org.apache.felix.gogo.shell;version=1.0.0,\ - org.jline;version=3.0.4,\ + org.apache.felix.gogo.command;version=latest,\ + org.apache.felix.gogo.runtime;version=latest,\ + org.apache.felix.gogo.shell;version=latest,\ + org.jline;version=3.29.0,\ org.fusesource.jansi;version=1.16.0 ## # Configuration Admin -configadmin=org.apache.felix.configadmin;version=1.8.8 +configadmin=org.apache.felix.configadmin;version=latest ## # Event Admin @@ -57,21 +57,26 @@ bndlib=biz.aQute.bndlib;version=7.4.0 ## # mockito -mockito=org.mockito.mockito-core;version=1.10.19 +mockito=\ + org.mockito.mockito-core;version=5.24.0,\ + net.bytebuddy.byte-buddy;version=1.17.7,\ + net.bytebuddy.byte-buddy-agent;version=1.17.7 ## # objenesis -objenesis=org.objenesis;version=2.2 +objenesis=org.objenesis;version=3.3 ## # runtime dependencies used by integration tests # itest.run=\ - org.apache.servicemix.bundles.junit;version=4.12,\ - org.mockito.mockito-core;version='[1.10.19,1.10.20)',\ - org.objenesis;version='[2.2.0,2.2.1)' + org.apache.servicemix.bundles.junit;version=4.13.2,\ + org.mockito.mockito-core;version='[5.24.0,5.25)',\ + net.bytebuddy.byte-buddy;version='[1.17.7,1.18)',\ + net.bytebuddy.byte-buddy-agent;version='[1.17.7,1.18)',\ + org.objenesis;version='[3.3.0,3.3.1)' ## # Felix Framework # -felix.framework=org.apache.felix.framework;version='[5.6.10,5.6.10]' +felix.framework=org.apache.felix.framework;version='[8.0.0,9)' diff --git a/dependencymanager/cnf/repository.mvn b/dependencymanager/cnf/repository.mvn index 0c8d0e3e50..ebebab0bbf 100644 --- a/dependencymanager/cnf/repository.mvn +++ b/dependencymanager/cnf/repository.mvn @@ -18,17 +18,17 @@ ant:ant:1.5 biz.aQute.bnd:biz.aQute.bnd.gradle:7.4.0 biz.aQute.bnd:biz.aQute.bndlib:7.4.0 -org.apache.felix:org.apache.felix.framework:5.6.10 +org.apache.felix:org.apache.felix.framework:8.0.0-SNAPSHOT org.apache.felix:org.apache.felix.eventadmin:1.4.4 -org.apache.felix:org.apache.felix.gogo.command:1.0.2 -org.apache.felix:org.apache.felix.gogo.shell:1.0.0 -org.apache.felix:org.apache.felix.gogo.runtime:1.0.10 -org.jline:jline:3.0.4 +org.apache.felix:org.apache.felix.gogo.command:1.1.3-SNAPSHOT +org.apache.felix:org.apache.felix.gogo.shell:1.1.5-SNAPSHOT +org.apache.felix:org.apache.felix.gogo.runtime:1.2.0-SNAPSHOT +org.jline:jline:3.29.0 org.apache.felix:org.apache.felix.http.api:3.0.0 org.apache.felix:org.apache.felix.http.servlet-api:1.1.2 -org.apache.felix:org.apache.felix.configadmin:1.8.8 -org.apache.felix:org.apache.felix.log:1.0.1 -org.apache.felix:org.apache.felix.metatype:1.1.2 +org.apache.felix:org.apache.felix.configadmin:1.10.0-SNAPSHOT +org.apache.felix:org.apache.felix.log:1.3.2 +org.apache.felix:org.apache.felix.metatype:1.2.4 org.apache.felix:org.apache.felix.http.jetty:3.4.8 org.apache.felix:org.apache.felix.webconsole:4.3.4 org.apache.felix:org.apache.felix.dependencymanager:4.6.1 @@ -37,12 +37,14 @@ org.apache.felix:org.apache.felix.dependencymanager.lambda:1.2.2 org.apache.felix:org.apache.felix.dependencymanager.runtime:4.0.8 org.apache.felix:org.apache.felix.dependencymanager.shell:4.0.9 org.jline:jline-builtins:3.3.0 -org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.12_1 -org.mockito:mockito-core:1.10.19 -org.objenesis:objenesis:2.2 -org.osgi:osgi.annotation:6.0.1 -org.osgi:osgi.cmpn:6.0.0 -org.osgi:osgi.core:6.0.0 +org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.13.2_1 +org.mockito:mockito-core:5.24.0 +net.bytebuddy:byte-buddy:1.17.7 +net.bytebuddy:byte-buddy-agent:1.17.7 +org.objenesis:objenesis:3.3 +org.osgi:osgi.annotation:8.1.0 +org.osgi:osgi.cmpn:7.0.0 +org.osgi:osgi.core:8.0.0 biz.aQute.bnd:biz.aQute.bnd.annotation:3.5.0 org.slf4j:slf4j-simple:1.7.7 org.slf4j:slf4j-api:1.7.7 diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd index 9216cbf839..06ad54cc73 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd @@ -16,9 +16,9 @@ # Bundle-Version: 6.0.0 -buildpath: \ - osgi.core;version=6.0,\ - osgi.cmpn;version=6.0,\ - biz.aQute.bndlib;version=3.5 + osgi.core;version=8.0,\ + osgi.cmpn;version=7.0,\ + biz.aQute.bndlib;version=7.4.0 Private-Package: org.apache.felix.dm.annotation.plugin.bnd Export-Package: org.apache.felix.dm.annotation.api Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd index a4dd40d2bc..4b0f4eb236 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd @@ -19,8 +19,8 @@ javac.target: 11 Bundle-Version: 1.0.0 -buildpath: \ org.apache.felix.dependencymanager;version=latest,\ - osgi.core;version=6.0,\ - osgi.cmpn;version=6.0 + osgi.core;version=8.0,\ + osgi.cmpn;version=7.0 -sub: \ *.bnd diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd index bd299c32dd..8efac4401d 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd @@ -15,27 +15,27 @@ # limitations under the License. # -runbundles: \ - org.apache.servicemix.bundles.junit;version=4.12,\ - org.apache.felix.metatype;version=1.1.2,\ - org.apache.felix.log;version=1.0.1,\ - org.apache.felix.configadmin;version=1.8.8,\ + org.apache.servicemix.bundles.junit;version=4.13.2,\ + org.apache.felix.metatype;version=1.2.4,\ + org.apache.felix.log;version=1.3.2,\ + org.apache.felix.configadmin;version=latest,\ org.apache.felix.dependencymanager;version=latest,\ org.apache.felix.dependencymanager.shell;version=latest,\ org.apache.felix.dependencymanager.index.itest.dynamic.customindex;version=latest,\ org.apache.felix.dependencymanager.index.itest.static.customindex;version=latest,\ org.apache.felix.dependencymanager.index.itest.tests;version=latest,\ - org.apache.felix.gogo.runtime;version=1.0.6 + org.apache.felix.gogo.runtime;version=latest -runee: JavaSE-11 -runvm: -ea --runfw: org.apache.felix.framework;version='[5.6.10,5.6.10]' +-runfw: org.apache.felix.framework;version='[8.0.0,9)' -buildpath: \ - osgi.core;version=6.0,\ - osgi.cmpn;version=6.0,\ + osgi.core;version=8.0,\ + osgi.cmpn;version=7.0,\ org.apache.felix.dependencymanager;version=latest,\ org.apache.felix.dependencymanager.shell;version=latest,\ ${junit},\ - org.apache.felix.gogo.runtime;version=1.0 + org.apache.felix.gogo.runtime;version=latest -runsystempackages: \ sun.reflect Test-Cases: \ diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/TestBase.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/TestBase.java index 36a98fe7a8..edda18832d 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/TestBase.java +++ b/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/TestBase.java @@ -223,6 +223,31 @@ protected void sleep(int ms) { return (Dictionary) properties; } + @Override + public org.osgi.service.log.Logger getLogger(String name) { + return null; + } + + @Override + public org.osgi.service.log.Logger getLogger(Class clazz) { + return null; + } + + @Override + public L getLogger(Bundle bundle, String name, Class loggerType) { + return null; + } + + @Override + public L getLogger(String name, Class loggerType) { + return null; + } + + @Override + public L getLogger(Class clazz, Class loggerType) { + return null; + } + public void log(int level, String message) { checkError(level, null); if (LOG_LEVEL >= level) { diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd index 600cfd2e54..a3f4efab51 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd @@ -15,27 +15,29 @@ # limitations under the License. # -runbundles: \ - org.apache.servicemix.bundles.junit;version=4.12,\ - org.mockito.mockito-core;version='[1.10.19,1.10.20)',\ - org.objenesis;version='[2.2.0,2.2.1)',\ - org.apache.felix.metatype;version=1.1.2,\ - org.apache.felix.log;version=1.0.1,\ - org.apache.felix.configadmin;version=1.8.8,\ + org.apache.servicemix.bundles.junit;version=4.13.2,\ + org.mockito.mockito-core;version='[5.24.0,5.25)',\ + net.bytebuddy.byte-buddy;version='[1.17.7,1.18)',\ + net.bytebuddy.byte-buddy-agent;version='[1.17.7,1.18)',\ + org.objenesis;version='[3.3.0,3.3.1)',\ + org.apache.felix.metatype;version=1.2.4,\ + org.apache.felix.log;version=1.3.2,\ + org.apache.felix.configadmin;version=latest,\ org.apache.felix.dependencymanager;version=latest,\ org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.gogo.runtime;version=1.0.6,\ + org.apache.felix.gogo.runtime;version=latest,\ org.apache.felix.gogo.shell,\ org.apache.felix.gogo.command -runee: JavaSE-11 -runvm: -ea --runfw: org.apache.felix.framework;version='[5.6.10,5.6.10]' +-runfw: org.apache.felix.framework;version='[8.0.0,9)' -buildpath: \ - osgi.core;version=6.0,\ - osgi.cmpn;version=6.0,\ + osgi.core;version=8.0,\ + osgi.cmpn;version=7.0,\ org.apache.felix.dependencymanager;version=latest,\ org.apache.felix.dependencymanager.shell;version=latest,\ ${junit},\ - org.apache.felix.gogo.runtime;version=1.0 + org.apache.felix.gogo.runtime;version=latest -runsystempackages: \ sun.reflect -sub: \ diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java index 23ab0d1924..1303851340 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java @@ -40,7 +40,8 @@ */ @SuppressWarnings({"unchecked", "rawtypes"}) public class ConfigurationDependencyTest extends TestBase { - final static String PID = "ConfigurationDependencyTest.pid"; + // Unique per test, so that the asynchronous deletion of the configuration of a previous test cannot reach the next one. + final String PID = "ConfigurationDependencyTest.pid." + System.nanoTime(); /** * Tests that we can provision a type-safe configuration to a component. diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java index 3c8c92eb59..fe05d9b344 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java @@ -34,7 +34,8 @@ * @author Felix Project Team */ public class FELIX5238_TypeSafeConfigWithDefaultMethodTest extends TestBase { - final static String PID = "ConfigurationDependencyTest.pid"; + // Unique per test, so that the asynchronous deletion of the configuration of a previous test cannot reach the next one. + final String PID = "FELIX5238_TypeSafeConfigWithDefaultMethodTest.pid." + System.nanoTime(); /** * Tests that we can provision a type-safe config annotation to a component. diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5243_ConfigUpdateMissedIfComponentIsRestartingTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5243_ConfigUpdateMissedIfComponentIsRestartingTest.java index ed7762c4df..1d3a206c5d 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5243_ConfigUpdateMissedIfComponentIsRestartingTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5243_ConfigUpdateMissedIfComponentIsRestartingTest.java @@ -45,7 +45,8 @@ * @author Felix Project Team */ public class FELIX5243_ConfigUpdateMissedIfComponentIsRestartingTest extends TestBase { - final static String PID = "ConfigurationDependencyTest.pid"; + // Unique per test, so that the asynchronous deletion of the configuration of a previous test cannot reach the next one. + final String PID = "FELIX5243_ConfigUpdateMissedIfComponentIsRestartingTest.pid." + System.nanoTime(); public void testOptionalConfigurationConsumer() throws InterruptedException { DependencyManager m = getDM(); diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java index 9be16c0255..cc8c834cc7 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java @@ -40,7 +40,8 @@ * @author Felix Project Team */ public class OptionalConfigurationDependencyTest extends TestBase { - final static String PID = "ConfigurationDependencyTest.pid"; + // Unique per test, so that the asynchronous deletion of the configuration of a previous test cannot reach the next one. + final String PID = "OptionalConfigurationDependencyTest.pid." + System.nanoTime(); public void testOptionalConfigurationConsumer() { DependencyManager m = getDM(); diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java index 78da1484a0..6873f9c98d 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java @@ -222,6 +222,31 @@ protected void sleep(int ms) { return (Dictionary) properties; } + @Override + public org.osgi.service.log.Logger getLogger(String name) { + return null; + } + + @Override + public org.osgi.service.log.Logger getLogger(Class clazz) { + return null; + } + + @Override + public L getLogger(Bundle bundle, String name, Class loggerType) { + return null; + } + + @Override + public L getLogger(String name, Class loggerType) { + return null; + } + + @Override + public L getLogger(Class clazz, Class loggerType) { + return null; + } + public void log(int level, String message) { checkError(level, null); if (LOG_LEVEL >= level) { diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd index 2e4831cf42..c2b0020695 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd @@ -19,22 +19,24 @@ org.apache.felix.dependencymanager.shell;version=latest,\ org.apache.felix.dependencymanager.lambda;version=latest,\ ${junit},\ - osgi.core;version=6.0,\ - osgi.cmpn;version=6.0 + osgi.core;version=8.0,\ + osgi.cmpn;version=7.0 -runbundles: \ - org.apache.servicemix.bundles.junit;version=4.12,\ - org.mockito.mockito-core;version='[1.10.19,1.10.20)',\ - org.objenesis;version='[2.2.0,2.2.1)',\ - org.apache.felix.metatype;version=1.0.10,\ - org.apache.felix.log;version=1.0.1,\ + org.apache.servicemix.bundles.junit;version=4.13.2,\ + org.mockito.mockito-core;version='[5.24.0,5.25)',\ + net.bytebuddy.byte-buddy;version='[1.17.7,1.18)',\ + net.bytebuddy.byte-buddy-agent;version='[1.17.7,1.18)',\ + org.objenesis;version='[3.3.0,3.3.1)',\ + org.apache.felix.metatype;version=1.2.4,\ + org.apache.felix.log;version=1.3.2,\ org.apache.felix.dependencymanager;version=latest,\ org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.configadmin;version=1.8.8,\ + org.apache.felix.configadmin;version=latest,\ org.apache.felix.dependencymanager.lambda;version=latest,\ - org.apache.felix.gogo.runtime;version=1.0.6 + org.apache.felix.gogo.runtime;version=latest -runee: JavaSE-11 --runfw: org.apache.felix.framework;version='[5.6.10,5.6.10]' +-runfw: org.apache.felix.framework;version='[8.0.0,9)' -runvm: -ea Bundle-Version: 0.0.0.${tstamp} Test-Cases: ${classes;CONCRETE;EXTENDS;junit.framework.TestCase} diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java index efc034e034..2cbc24dba9 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java @@ -216,6 +216,31 @@ protected void sleep(int ms) { } } + @Override + public org.osgi.service.log.Logger getLogger(String name) { + return null; + } + + @Override + public org.osgi.service.log.Logger getLogger(Class clazz) { + return null; + } + + @Override + public L getLogger(Bundle bundle, String name, Class loggerType) { + return null; + } + + @Override + public L getLogger(String name, Class loggerType) { + return null; + } + + @Override + public L getLogger(Class clazz, Class loggerType) { + return null; + } + public void log(int level, String message) { checkError(level, null); if (LOG_LEVEL >= level) { diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd index 5b5b5a1066..559acfb89e 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd @@ -2,8 +2,8 @@ org.apache.felix.dependencymanager.lambda;version=latest,\ org.apache.felix.dependencymanager;version=latest,\ org.apache.felix.gogo.runtime;version=latest,\ - osgi.core;version=6.0,\ - osgi.cmpn;version=6.0,\ + osgi.core;version=8.0,\ + osgi.cmpn;version=7.0,\ biz.aQute.bnd.annotation Bundle-Version: 0.0.0.${tstamp} diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd index c5e5ca3fc2..c0fc44827e 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd @@ -19,13 +19,13 @@ javac.target: 11 Bundle-Version: 2.0.0 -buildpath: \ org.apache.felix.dependencymanager;version=latest,\ - osgi.core;version=6.0,\ - osgi.cmpn;version=6.0,\ - osgi.annotation;version=6.0.1 + osgi.core;version=8.0,\ + osgi.cmpn;version=7.0,\ + osgi.annotation;version=8.1 Export-Package: \ org.apache.felix.dm.lambda,\ org.apache.felix.dm.lambda.callbacks --runfw: org.apache.felix.framework;version='[4.4.1,4.4.1]' +-runfw: org.apache.felix.framework;version='[8.0.0,9)' -runee: JavaSE-11 Private-Package: org.apache.felix.dm.lambda.impl Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd index 5927e12365..cfc781e5f8 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd @@ -20,22 +20,24 @@ org.apache.felix.dependencymanager;version=latest,\ org.apache.felix.dependencymanager.runtime;version=latest,\ org.apache.felix.dependencymanager.itest.api;version=latest,\ - osgi.core;version=6.0,\ - osgi.cmpn;version=6.0 + osgi.core;version=8.0,\ + osgi.cmpn;version=7.0 -runbundles: \ - org.apache.servicemix.bundles.junit;version=4.12,\ - org.mockito.mockito-core;version='[1.10.19,1.10.20)',\ - org.objenesis;version='[2.2.0,2.2.1)',\ - org.apache.felix.metatype;version=1.1.2,\ - org.apache.servicemix.bundles.junit;version=4.12,\ - org.apache.felix.configadmin;version=1.8.8,\ - org.apache.felix.gogo.runtime;version=1.0.6,\ - org.apache.felix.log;version=1.0.1,\ + org.apache.servicemix.bundles.junit;version=4.13.2,\ + org.mockito.mockito-core;version='[5.24.0,5.25)',\ + net.bytebuddy.byte-buddy;version='[1.17.7,1.18)',\ + net.bytebuddy.byte-buddy-agent;version='[1.17.7,1.18)',\ + org.objenesis;version='[3.3.0,3.3.1)',\ + org.apache.felix.metatype;version=1.2.4,\ + org.apache.servicemix.bundles.junit;version=4.13.2,\ + org.apache.felix.configadmin;version=latest,\ + org.apache.felix.gogo.runtime;version=latest,\ + org.apache.felix.log;version=1.3.2,\ org.apache.felix.dependencymanager;version=latest,\ org.apache.felix.dependencymanager.runtime;version=latest,\ org.apache.felix.dependencymanager.shell;version=latest -runee: JavaSE-11 --runfw: org.apache.felix.framework;version='[5.6.10,5.6.10]' +-runfw: org.apache.felix.framework;version='[8.0.0,9)' -runsystempackages: \ sun.reflect -runvm:-ea diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd index 0c8e16ebd8..1b2d1769f3 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd @@ -21,8 +21,8 @@ Bundle-Version: 1.0.0.${tstamp} org.apache.felix.gogo.runtime;version=latest,\ org.apache.felix.dependencymanager.runtime;version=latest,\ org.apache.felix.dependencymanager.annotation;version=latest,\ - osgi.core;version=6.0,\ - osgi.cmpn;version=6.0 + osgi.core;version=8.0,\ + osgi.cmpn;version=7.0 -sub: \ *.bnd -metatype: * diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd index 46c403552a..a266661fda 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd @@ -18,9 +18,9 @@ ${mockito},\ org.apache.felix.dependencymanager;version=latest,\ ${junit},\ - osgi.core;version=6.0,\ - osgi.cmpn;version=6.0,\ - org.apache.felix.gogo.runtime;version=1.0 + osgi.core;version=8.0,\ + osgi.cmpn;version=7.0,\ + org.apache.felix.gogo.runtime;version=latest Private-Package: \ org.apache.felix.dm.shell Bundle-Activator:org.apache.felix.dm.shell.Activator @@ -34,4 +34,4 @@ Bundle-Vendor: The Apache Software Foundation -testpath: \ ${junit},\ ${mockito},\ - org.objenesis;version=2.2 + org.objenesis;version=3.3 diff --git a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd index 69670ad170..8be859759b 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd @@ -17,9 +17,9 @@ -buildpath: \ ${mockito},\ ${junit},\ - osgi.core;version=6.0,\ - osgi.cmpn;version=6.0,\ - osgi.annotation;version=6.0 + osgi.core;version=8.0,\ + osgi.cmpn;version=7.0,\ + osgi.annotation;version=8.1 Private-Package: \ org.apache.felix.dm.impl,\ org.apache.felix.dm.impl.index,\ @@ -45,7 +45,7 @@ Bundle-Category: osgi -testpath: \ ${junit},\ ${mockito},\ - org.objenesis;version=2.2 + org.objenesis;version=3.3 diff --git a/dependencymanager/org.apache.felix.dependencymanager/test/org/apache/felix/dm/tracker/TrackedTest.java b/dependencymanager/org.apache.felix.dependencymanager/test/org/apache/felix/dm/tracker/TrackedTest.java index 5b12dbce96..432e27045b 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/test/org/apache/felix/dm/tracker/TrackedTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager/test/org/apache/felix/dm/tracker/TrackedTest.java @@ -255,6 +255,18 @@ public Bundle getBundle() { return null; } + @Override + @SuppressWarnings("rawtypes") + public java.util.Dictionary getProperties() { + return null; + } + + @Override + @SuppressWarnings("rawtypes") + public Object adapt(Class type) { + return null; + } + @Override public Bundle[] getUsingBundles() { return null; diff --git a/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java b/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java index 1fd8fd044c..aff6950240 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java @@ -281,6 +281,18 @@ public Bundle getBundle() { return null; } + @Override + @SuppressWarnings("rawtypes") + public java.util.Dictionary getProperties() { + return null; + } + + @Override + @SuppressWarnings("rawtypes") + public Object adapt(Class type) { + return null; + } + @Override public Bundle[] getUsingBundles() { return null; diff --git a/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java b/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java index 73ebc6bea1..a90c702eb4 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java +++ b/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java @@ -69,6 +69,18 @@ public Bundle getBundle() { return null; } + @Override + @SuppressWarnings("rawtypes") + public java.util.Dictionary getProperties() { + return null; + } + + @Override + @SuppressWarnings("rawtypes") + public Object adapt(Class type) { + return null; + } + @Override public Bundle[] getUsingBundles() { return null; From 36168cfdb90f65420397b6cc6e37f47c86ce9f78 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 24 Oct 2026 19:12:50 +0000 Subject: [PATCH 04/12] FELIX-6872 - Build the Dependency Manager in CI Add the Dependency Manager to the GitHub Actions workflow with its trigger paths and path filter. It is built with Gradle after the framework, Gogo and Config Admin snapshots are installed into the local Maven repository, and the annotation bundle, which is a bnd plugin used by the other projects, is built first in a separate Gradle invocation. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- .github/workflows/maven-ci.yml | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index 68e223727d..d569185557 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -23,6 +23,7 @@ on: - 'log.extension/**' - 'examples/**' - 'configadmin/**' + - 'dependencymanager/**' pull_request: branches: [ "master", "feature/**", "maintenance/**" ] paths: @@ -45,6 +46,7 @@ on: - 'log.extension/**' - 'examples/**' - 'configadmin/**' + - 'dependencymanager/**' # Cancel superseded runs for the same branch. github.head_ref is only set for # pull_request events, so pushes fall back to github.ref, which groups per branch: @@ -118,6 +120,8 @@ jobs: - 'log.extension/**' examples: - 'examples/**' + dependencymanager: + - 'dependencymanager/**' - name: Felix Configuration JSON if: steps.changes.outputs.cm-json == 'true' || steps.changes.outputs.configurator == 'true' run: mvn -B -V -Dstyle.color=always --file cm.json/pom.xml clean install @@ -133,7 +137,7 @@ jobs: # code being changed rather than the last release. A producer is therefore built and # installed whenever it or one of its consumers changed. See FELIX-6870. - name: Resolve the versions built in this repository - if: steps.changes.outputs.framework == 'true' || steps.changes.outputs.http == 'true' || steps.changes.outputs.configadmin == 'true' || steps.changes.outputs.scr == 'true' || steps.changes.outputs.gogo == 'true' || steps.changes.outputs.utils == 'true' || steps.changes.outputs.resolver == 'true' + if: steps.changes.outputs.framework == 'true' || steps.changes.outputs.http == 'true' || steps.changes.outputs.configadmin == 'true' || steps.changes.outputs.scr == 'true' || steps.changes.outputs.gogo == 'true' || steps.changes.outputs.utils == 'true' || steps.changes.outputs.resolver == 'true' || steps.changes.outputs.dependencymanager == 'true' run: | record() { echo "$1=$2" >> "$GITHUB_ENV" @@ -147,10 +151,10 @@ jobs: record "GOGO_$(echo "$module" | tr 'a-z' 'A-Z')_VERSION" "$(mvn -B -q --file gogo/pom.xml -pl "$module" help:evaluate -Dexpression=project.version -DforceStdout)" done - name: Felix Framework - if: steps.changes.outputs.framework == 'true' || steps.changes.outputs.http == 'true' || steps.changes.outputs.configadmin == 'true' || steps.changes.outputs.scr == 'true' || steps.changes.outputs.gogo == 'true' + if: steps.changes.outputs.framework == 'true' || steps.changes.outputs.http == 'true' || steps.changes.outputs.configadmin == 'true' || steps.changes.outputs.scr == 'true' || steps.changes.outputs.gogo == 'true' || steps.changes.outputs.dependencymanager == 'true' run: mvn -B -V -Dstyle.color=always --file framework/pom.xml clean install - name: Felix Config Admin - if: steps.changes.outputs.configadmin == 'true' || steps.changes.outputs.scr == 'true' + if: steps.changes.outputs.configadmin == 'true' || steps.changes.outputs.scr == 'true' || steps.changes.outputs.dependencymanager == 'true' run: mvn -B -V -Dstyle.color=always --file configadmin/pom.xml clean install "-Dfelix.framework.version=$FRAMEWORK_VERSION" - name: Felix SCR if: steps.changes.outputs.scr == 'true' @@ -174,8 +178,8 @@ jobs: if: steps.changes.outputs.main == 'true' run: mvn -B -V -Dstyle.color=always --file main/pom.xml clean verify - name: Felix Gogo Shell - if: steps.changes.outputs.gogo == 'true' - run: mvn -B -V -Dstyle.color=always --file gogo/pom.xml clean verify "-Dfelix.gogo.command.version=$GOGO_COMMAND_VERSION" "-Dfelix.gogo.runtime.version=$GOGO_RUNTIME_VERSION" "-Dfelix.gogo.shell.version=$GOGO_SHELL_VERSION" "-Dfelix.gogo.jline.version=$GOGO_JLINE_VERSION" "-Dfelix.framework.version=$FRAMEWORK_VERSION" + if: steps.changes.outputs.gogo == 'true' || steps.changes.outputs.dependencymanager == 'true' + run: mvn -B -V -Dstyle.color=always --file gogo/pom.xml clean install "-Dfelix.gogo.command.version=$GOGO_COMMAND_VERSION" "-Dfelix.gogo.runtime.version=$GOGO_RUNTIME_VERSION" "-Dfelix.gogo.shell.version=$GOGO_SHELL_VERSION" "-Dfelix.gogo.jline.version=$GOGO_JLINE_VERSION" "-Dfelix.framework.version=$FRAMEWORK_VERSION" - name: Felix utils if: steps.changes.outputs.utils == 'true' || steps.changes.outputs.resolver == 'true' run: mvn -B -V -Dstyle.color=always --file utils/pom.xml clean install @@ -194,6 +198,17 @@ jobs: - name: Felix examples if: steps.changes.outputs.examples == 'true' run: mvn -B -V -Dstyle.color=always --file examples/pom.xml clean verify + # The Dependency Manager is built with Gradle and bnd rather than Maven. It runs last, + # on the framework, Gogo and Config Admin snapshots installed into the local Maven + # repository by the steps above. + - name: Felix Dependency Manager + if: steps.changes.outputs.dependencymanager == 'true' + working-directory: dependencymanager + run: | + # The annotation bundle is a bnd plugin used by the other projects. It has to exist + # before they are configured, so it is built in a separate Gradle invocation. + ./gradlew --no-daemon --console=plain org.apache.felix.dependencymanager.annotation:jar + ./gradlew --no-daemon --console=plain build - name: Upload Test Results if: always() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 From 7d021d6a6281fec20b9b38230c952c17f5ba1383 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 24 Oct 2026 19:57:51 +0000 Subject: [PATCH 05/12] FELIX-6872 - Dependency Manager: fix a race in FELIX5200_FactoryPidNotRestartedTest Publish the test instance before releasing the test thread, which otherwise sometimes compared with the previous instance (seen on JDK 17 in CI). Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- .../dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java index 1bab665482..0151ff9611 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java @@ -94,8 +94,9 @@ void updated(Dictionary properties) { } void start() { - m_ensure.steps(m_steps); + // the instance has to be published before the test thread is released by the step m_currentInstance = this; + m_ensure.steps(m_steps); } void stop() { From 99e1df58b6da9459b9e592ae7a81393af90b522c Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 24 Oct 2026 21:42:14 +0000 Subject: [PATCH 06/12] FELIX-6872 - Dependency Manager: make FELIX5200_FactoryPidNotRestartedTest independent of how often Config Admin delivers the configuration Config Admin sometimes delivers the factory configuration to the factory more than once, for example when the factory is registered again. The Dependency Manager then replaces the adapter instance (stop, then a new start), which the test, which counted the calls, did not expect: it timed out, or its late calls failed the next test. Follow the adapter instances instead of counting the calls. Ran 20 times in a row on 2 CPUs without failure, where the old test failed 2 times out of 12. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- .../FELIX5200_FactoryPidNotRestartedTest.java | 64 +++++++++++-------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java index 0151ff9611..9b484f09d9 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java @@ -21,10 +21,10 @@ import java.io.IOException; import java.util.Dictionary; import java.util.Properties; +import java.util.function.BooleanSupplier; import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; -import org.apache.felix.dm.itest.util.Ensure; import org.apache.felix.dm.itest.util.TestBase; import org.junit.Assert; import org.osgi.service.cm.Configuration; @@ -35,24 +35,22 @@ * The factory configuration is created, the "Required" service is registered, so a factory configuration adapter INSTANCE1 is then created. * Now the "Required" service is unregistered: the factory config adapter INSTANCE1 is then stopped. * And when the "Required" service comes up again, then a new factory config adapter INSTANCE2 should be re-created, updated and started. + * When the factory configuration is removed, the factory config adapter instance is stopped. + *

+ * Config Admin may deliver the configuration to the factory more than once (for example when the factory is + * registered again), which makes the adapter instance be replaced by an other one. The test does not depend on + * how often that happens: it follows the instances instead of counting the calls. * * @author Felix Project Team */ public class FELIX5200_FactoryPidNotRestartedTest extends TestBase { - static FactoryPidComponent m_currentInstance; + private static final int TIMEOUT = 10000; - static Ensure m_ensure = new Ensure(); + // the instances of the adapter, in the order they have been started + static final java.util.List m_instances = new java.util.concurrent.CopyOnWriteArrayList<>(); - static Ensure.Steps m_steps = new Ensure.Steps( - 1, // updated is called the first time the adapter instance is created - 2, // component started - 3, // "Required" service is unregistered, and adapter instance is stopped - 4, // "Required" service is re-registered, a new adapter instance is created and called in updated - 5, // the new adapter instance is then started - 6 // the configuration is removed and the new adapter instance is stopped - ); - - public void testFactoryAdapterNotRestartedTest() { + public void testFactoryAdapterNotRestartedTest() throws InterruptedException { + m_instances.clear(); DependencyManager dm = getDM(); Component adapter = dm.createFactoryConfigurationAdapterService("factory.pid", "updated", false) @@ -71,36 +69,48 @@ public void testFactoryAdapterNotRestartedTest() { dm.add(adapter); dm.add(required); // adapter instance1 updated and started - m_ensure.waitForStep(2, 5000); - FactoryPidComponent currentInstance = m_currentInstance; + waitFor("the first adapter instance is started", () -> !m_instances.isEmpty()); + FactoryPidComponent instance1 = m_instances.get(0); + dm.remove(required); // adapter instance1 stopped - m_ensure.waitForStep(3, 5000); + waitFor("the first adapter instance is stopped", () -> instance1.m_stopped); + int started = m_instances.size(); + dm.add(required); - // adapter instance2 updated and started - m_ensure.waitForStep(5, 5000); - // a new adapter instance should have been created - Assert.assertNotEquals(currentInstance, m_currentInstance); + // a new adapter instance is created, updated and started + waitFor("a new adapter instance is started", () -> m_instances.size() > started); + FactoryPidComponent instance2 = m_instances.get(m_instances.size() - 1); + Assert.assertNotSame(instance1, instance2); + dm.remove(configurator); - // adapter instance2 stopped - m_ensure.waitForStep(6, 5000); + // the configuration is removed: the last adapter instance is stopped + waitFor("the adapter instance is stopped when the configuration is removed", () -> instance2.m_stopped); + } + + private void waitFor(String what, BooleanSupplier condition) throws InterruptedException { + long end = System.currentTimeMillis() + TIMEOUT; + while (!condition.getAsBoolean()) { + if (System.currentTimeMillis() > end) { + Assert.fail("Timed out waiting until " + what); + } + Thread.sleep(10); + } } public static class FactoryPidComponent { RequiredService m_required; + volatile boolean m_stopped; void updated(Dictionary properties) { - m_ensure.steps(m_steps); } void start() { - // the instance has to be published before the test thread is released by the step - m_currentInstance = this; - m_ensure.steps(m_steps); + m_instances.add(this); } void stop() { - m_ensure.steps(m_steps); + m_stopped = true; } } From 8c15f26ea2f42bde93b49f7679877f71335ee94a Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 25 Oct 2026 16:04:24 +0000 Subject: [PATCH 07/12] FELIX-6872 - Dependency Manager: ignore repeated deliveries of the same configuration in the configuration tests Config Admin can provide a configuration to a service twice, for example when the service registers while its configuration is updated. The configuration tests count the updates they expect, so a repeated delivery of the same configuration failed them now and then on the CI runners (expected:<2> but was:<3>). They now ignore a repeated delivery (helper ConfigDeliveries); a lost configuration still counts. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- .../api/ConfigurationDependencyTest.java | 20 ++++++ ...8_TypeSafeConfigWithDefaultMethodTest.java | 10 +++ .../OptionalConfigurationDependencyTest.java | 5 ++ .../felix/dm/itest/util/ConfigDeliveries.java | 61 +++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/ConfigDeliveries.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java index 1303851340..e90581e0bb 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java @@ -27,6 +27,7 @@ import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.itest.util.ConfigDeliveries; import org.apache.felix.dm.itest.util.Ensure; import org.apache.felix.dm.itest.util.TestBase; import org.osgi.service.cm.Configuration; @@ -223,6 +224,7 @@ public void destroy() throws IOException { static class ConfigurationConsumer implements ManagedService, Runnable { protected final Ensure m_ensure; + protected final ConfigDeliveries m_deliveries = new ConfigDeliveries(); public ConfigurationConsumer(Ensure e) { m_ensure = e; @@ -230,6 +232,9 @@ public ConfigurationConsumer(Ensure e) { public void updated(Dictionary props) throws ConfigurationException { Assert.assertNotNull(props); + if (m_deliveries.isRepeat(props)) { + return; + } m_ensure.step(2); if (!"testvalue".equals(props.get("testkey"))) { Assert.fail("Could not find the configured property."); @@ -254,6 +259,9 @@ public ConfigurationConsumer3(Ensure e) { public void updated(Dictionary props) throws ConfigurationException { Assert.assertNotNull(props); + if (m_deliveries.isRepeat(props)) { + return; + } if (!"testvalue".equals(props.get("testkey"))) { Assert.fail("Could not find the configured property."); } @@ -277,6 +285,9 @@ public ConfigurationConsumer4(Ensure e) { } public void updated(Dictionary props) throws ConfigurationException { + if (m_deliveries.isRepeat(props)) { + return; + } if (! m_configured) { Assert.assertNotNull(props); if (!"testvalue".equals(props.get("testkey"))) { @@ -311,6 +322,7 @@ public void updatedWithComponentArg(Component component, Dictionary props) throw static class ConfigurationConsumerCallbackInstance { private final Ensure m_ensure; + private final ConfigDeliveries m_deliveries = new ConfigDeliveries(); public ConfigurationConsumerCallbackInstance(Ensure e) { m_ensure = e; @@ -318,6 +330,9 @@ public ConfigurationConsumerCallbackInstance(Ensure e) { public void updateConfiguration(Dictionary props) throws Exception { Assert.assertNotNull(props); + if (m_deliveries.isRepeat(props)) { + return; + } m_ensure.step(2); if (!"testvalue".equals(props.get("testkey"))) { Assert.fail("Could not find the configured property."); @@ -369,6 +384,7 @@ static interface MyConfig { static class ConfigurationConsumerWithTypeSafeConfiguration { private final Ensure m_ensure; + private final ConfigDeliveries m_deliveries = new ConfigDeliveries(); public ConfigurationConsumerWithTypeSafeConfiguration(Ensure e) { m_ensure = e; @@ -377,6 +393,9 @@ public ConfigurationConsumerWithTypeSafeConfiguration(Ensure e) { // configuration updates is always the first invoked callback (before init). public void updated(Component component, MyConfig cfg) throws ConfigurationException { if (cfg != null) { + if (m_deliveries.isRepeat((Object) cfg.getTestkey())) { + return; + } Assert.assertNotNull(component); Assert.assertNotNull(cfg); m_ensure.step(2); @@ -384,6 +403,7 @@ public void updated(Component component, MyConfig cfg) throws ConfigurationExcep Assert.fail("Could not find the configured property."); } } else { + m_deliveries.isRepeat((Dictionary) null); m_ensure.step(); } } diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java index fe05d9b344..0096e073b9 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java @@ -20,6 +20,7 @@ import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.itest.util.ConfigDeliveries; import org.apache.felix.dm.itest.util.Ensure; import org.apache.felix.dm.itest.util.TestBase; import org.junit.Assert; @@ -93,6 +94,7 @@ public static interface MyConfigInterface { static class ConfigurationConsumerBase { protected final Ensure m_ensure; + protected final ConfigDeliveries m_deliveries = new ConfigDeliveries(); public ConfigurationConsumerBase(Ensure e) { m_ensure = e; @@ -116,6 +118,9 @@ public ConfigurationConsumer1(Ensure e) { // configuration updates is always the first invoked callback (before init). public void updated(Component component, MyConfigAnnot cfg) throws ConfigurationException { if (cfg != null) { + if (m_deliveries.isRepeat((Object) (cfg.getTestkey() + "/" + cfg.getTestkey2()))) { + return; + } Assert.assertNotNull(component); Assert.assertNotNull(cfg); if (!"testvalue".equals(cfg.getTestkey())) { @@ -126,6 +131,7 @@ public void updated(Component component, MyConfigAnnot cfg) throws Configuration } m_ensure.step(2); } else { + m_deliveries.isRepeat((java.util.Dictionary) null); m_ensure.step(); } } @@ -139,6 +145,9 @@ public ConfigurationConsumer2(Ensure e) { // configuration updates is always the first invoked callback (before init). public void updated(Component component, MyConfigInterface cfg) throws ConfigurationException { if (cfg != null) { + if (m_deliveries.isRepeat((Object) (cfg.getTestkey() + "/" + cfg.getTestkey2()))) { + return; + } Assert.assertNotNull(component); Assert.assertNotNull(cfg); if (!"testvalue".equals(cfg.getTestkey())) { @@ -149,6 +158,7 @@ public void updated(Component component, MyConfigInterface cfg) throws Configura } m_ensure.step(2); } else { + m_deliveries.isRepeat((java.util.Dictionary) null); m_ensure.step(); } } diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java index cc8c834cc7..49c3dcec22 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java @@ -20,6 +20,7 @@ import org.apache.felix.dm.Component; import org.apache.felix.dm.DependencyManager; +import org.apache.felix.dm.itest.util.ConfigDeliveries; import org.apache.felix.dm.itest.util.Ensure; import org.apache.felix.dm.itest.util.TestBase; import org.junit.Assert; @@ -70,6 +71,7 @@ public static interface MyConfig { static class OptionalConfigurationConsumer { protected final Ensure m_ensure; protected volatile int m_updateCount; + private final ConfigDeliveries m_deliveries = new ConfigDeliveries(); public OptionalConfigurationConsumer(Ensure e) { m_ensure = e; @@ -77,6 +79,9 @@ public OptionalConfigurationConsumer(Ensure e) { public void updated(MyConfig cnf) { // optional configuration, called after start(), like any other optional dependency callbacks. if (cnf != null) { + if (m_deliveries.isRepeat((Object) cnf.getTestkey())) { + return; // the same configuration delivered again + } m_updateCount ++; if (m_updateCount == 1) { if (!"default".equals(cnf.getTestkey())) { diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/ConfigDeliveries.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/ConfigDeliveries.java new file mode 100644 index 0000000000..8250ef8093 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/ConfigDeliveries.java @@ -0,0 +1,61 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.felix.dm.itest.util; + +import java.util.Collections; +import java.util.Dictionary; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +/** + * Detects that Config Admin delivers the same configuration again to a callback. + *

+ * Config Admin can provide a configuration to a service twice, for example once because the service registers + * while the configuration is updated (an update of the registration and an update of the configuration, close + * together). The tests count the configuration updates they expect, and ignore such a repeated delivery. + */ +public class ConfigDeliveries { + private Object m_last; + + /** + * @return true if the configuration is the one which has been delivered the last time. A lost configuration + * (null) is never a repeat. + */ + public synchronized boolean isRepeat(Dictionary properties) { + if (properties == null) { + m_last = null; + return false; + } + Map copy = new HashMap<>(); + for (Object key : Collections.list(properties.keys())) { + copy.put(key, properties.get(key)); + } + return isRepeat((Object) copy); + } + + /** + * @param identity describes the content of a typed configuration, for example the values of its properties. + */ + public synchronized boolean isRepeat(Object identity) { + boolean repeat = identity != null && Objects.equals(identity, m_last); + m_last = identity; + return repeat; + } +} From 440f06177cfb9979fac2f11c687c2837ab882bd6 Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 25 Oct 2026 18:12:20 +0000 Subject: [PATCH 08/12] FELIX-6872 - Dependency Manager: ignore the harmless Config Admin message about a new factory configuration in the test base Config Admin logs "Ignoring new configuration pid=..." at error level when a factory configuration has been created but not updated yet while the factory registers; it provides the configuration with the update. The test base fails a test when an error is logged, so this message failed an otherwise passing runtime integration test now and then on the CI runners. The test bases ignore this one message, every other logged error still fails the test. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- .../felix/dm/index/itest/tests/TestBase.java | 19 ++++++++++++++----- .../apache/felix/dm/itest/util/TestBase.java | 19 ++++++++++++++----- .../felix/dm/lambda/itest/TestBase.java | 19 ++++++++++++++----- 3 files changed, 42 insertions(+), 15 deletions(-) diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/TestBase.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/TestBase.java index edda18832d..fa17ba1272 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/TestBase.java +++ b/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/TestBase.java @@ -249,14 +249,14 @@ public L getLogger(Class clazz, Class } public void log(int level, String message) { - checkError(level, null); + checkError(level, message, null); if (LOG_LEVEL >= level) { System.out.println(getLevel(level) + " - " + Thread.currentThread().getName() + " : " + message); } } public void log(int level, String message, Throwable exception) { - checkError(level, exception); + checkError(level, message, exception); if (LOG_LEVEL >= level) { StringBuilder sb = new StringBuilder(); sb.append(getLevel(level) + " - " + Thread.currentThread().getName() + " : "); @@ -267,7 +267,7 @@ public void log(int level, String message, Throwable exception) { } public void log(ServiceReference sr, int level, String message) { - checkError(level, null); + checkError(level, message, null); if (LOG_LEVEL >= level) { StringBuilder sb = new StringBuilder(); sb.append(getLevel(level) + " - " + Thread.currentThread().getName() + " : "); @@ -277,7 +277,7 @@ public void log(ServiceReference sr, int level, String message) { } public void log(ServiceReference sr, int level, String message, Throwable exception) { - checkError(level, exception); + checkError(level, message, exception); if (LOG_LEVEL >= level) { StringBuilder sb = new StringBuilder(); sb.append(getLevel(level) + " - " + Thread.currentThread().getName() + " : "); @@ -317,7 +317,16 @@ private String getLevel(int level) { } } - private void checkError(int level, Throwable exception) { + // Config Admin logs this at error level when a factory configuration has been created but not updated yet + // while the factory registers. It provides the configuration with the update, so it is not an error. + private static boolean isIgnoredMessage(String message) { + return message != null && message.startsWith("Ignoring new configuration pid="); + } + + private void checkError(int level, String message, Throwable exception) { + if (isIgnoredMessage(message) && exception == null) { + return; + } if (level <= LOG_ERROR) { m_errorsLogged = true; } diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java index 6873f9c98d..c1754cd58c 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java +++ b/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java @@ -248,14 +248,14 @@ public L getLogger(Class clazz, Class } public void log(int level, String message) { - checkError(level, null); + checkError(level, message, null); if (LOG_LEVEL >= level) { System.out.println(getLevel(level) + " - " + Thread.currentThread().getName() + " : " + message); } } public void log(int level, String message, Throwable exception) { - checkError(level, exception); + checkError(level, message, exception); if (LOG_LEVEL >= level) { StringBuilder sb = new StringBuilder(); sb.append(getLevel(level) + " - " + Thread.currentThread().getName() + " : "); @@ -266,7 +266,7 @@ public void log(int level, String message, Throwable exception) { } public void log(ServiceReference sr, int level, String message) { - checkError(level, null); + checkError(level, message, null); if (LOG_LEVEL >= level) { StringBuilder sb = new StringBuilder(); sb.append(getLevel(level) + " - " + Thread.currentThread().getName() + " : "); @@ -276,7 +276,7 @@ public void log(ServiceReference sr, int level, String message) { } public void log(ServiceReference sr, int level, String message, Throwable exception) { - checkError(level, exception); + checkError(level, message, exception); if (LOG_LEVEL >= level) { StringBuilder sb = new StringBuilder(); sb.append(getLevel(level) + " - " + Thread.currentThread().getName() + " : "); @@ -316,7 +316,16 @@ private String getLevel(int level) { } } - private void checkError(int level, Throwable exception) { + // Config Admin logs this at error level when a factory configuration has been created but not updated yet + // while the factory registers. It provides the configuration with the update, so it is not an error. + private static boolean isIgnoredMessage(String message) { + return message != null && message.startsWith("Ignoring new configuration pid="); + } + + private void checkError(int level, String message, Throwable exception) { + if (isIgnoredMessage(message) && exception == null) { + return; + } if (level <= LOG_ERROR) { m_errorsLogged = true; } diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java index 2cbc24dba9..8df2dd0e13 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java @@ -242,14 +242,14 @@ public L getLogger(Class clazz, Class } public void log(int level, String message) { - checkError(level, null); + checkError(level, message, null); if (LOG_LEVEL >= level) { System.out.println(getLevel(level) + " - " + Thread.currentThread().getName() + " : " + message); } } public void log(int level, String message, Throwable exception) { - checkError(level, exception); + checkError(level, message, exception); if (LOG_LEVEL >= level) { StringBuilder sb = new StringBuilder(); sb.append(getLevel(level) + " - " + Thread.currentThread().getName() + " : "); @@ -261,7 +261,7 @@ public void log(int level, String message, Throwable exception) { @SuppressWarnings("rawtypes") public void log(ServiceReference sr, int level, String message) { - checkError(level, null); + checkError(level, message, null); if (LOG_LEVEL >= level) { StringBuilder sb = new StringBuilder(); sb.append(getLevel(level) + " - " + Thread.currentThread().getName() + " : "); @@ -272,7 +272,7 @@ public void log(ServiceReference sr, int level, String message) { @SuppressWarnings("rawtypes") public void log(ServiceReference sr, int level, String message, Throwable exception) { - checkError(level, exception); + checkError(level, message, exception); if (LOG_LEVEL >= level) { StringBuilder sb = new StringBuilder(); sb.append(getLevel(level) + " - " + Thread.currentThread().getName() + " : "); @@ -312,7 +312,16 @@ private String getLevel(int level) { } } - private void checkError(int level, Throwable exception) { + // Config Admin logs this at error level when a factory configuration has been created but not updated yet + // while the factory registers. It provides the configuration with the update, so it is not an error. + private static boolean isIgnoredMessage(String message) { + return message != null && message.startsWith("Ignoring new configuration pid="); + } + + private void checkError(int level, String message, Throwable exception) { + if (isIgnoredMessage(message) && exception == null) { + return; + } if (level <= LOG_ERROR) { m_errorsLogged = true; } From e74b823f6e3e900e2e44556fd762918abdbca65f Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 24 Oct 2026 20:17:30 +0000 Subject: [PATCH 09/12] FELIX-6872 - Dependency Manager: build the bundles with Maven Add a Maven reactor for the Dependency Manager with the core, annotation, runtime, shell and lambda bundles, built by the maven-bundle-plugin with the existing source layout and the same bundle headers as the bnd build. The versions of the exported packages are still read from the packageinfo files, and the API is baselined against the last release (r16): every exported package is unchanged, so only the bundle versions move, to a new major for the Java 11 baseline (dependencymanager 5.0.0, annotation 6.0.0, runtime 5.0.0, shell 5.0.0, lambda 2.0.0). The bundles are compiled against the OSGi R6 API, the lowest one supported, so their imports stay as they were in r16 (for example org.osgi.framework 1.8). The test stubs implementing ServiceReference no longer use @Override on the methods that were only added in later releases. The unit tests run with surefire, and the packageinfo files are excluded from the license check. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- dependencymanager/.gitignore | 2 + .../pom.xml | 88 +++++++++++ .../pom.xml | 93 ++++++++++++ .../pom.xml | 89 +++++++++++ .../pom.xml | 101 +++++++++++++ .../pom.xml | 110 ++++++++++++++ .../test/.gitignore | 0 .../apache/felix/dm/tracker/TrackedTest.java | 6 +- ...ultiPropertyFilterIndexReferencedTest.java | 6 +- .../test/test/TestReference.java | 6 +- dependencymanager/pom.xml | 142 ++++++++++++++++++ 11 files changed, 631 insertions(+), 12 deletions(-) create mode 100644 dependencymanager/org.apache.felix.dependencymanager.annotation/pom.xml create mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda/pom.xml create mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime/pom.xml create mode 100644 dependencymanager/org.apache.felix.dependencymanager.shell/pom.xml create mode 100644 dependencymanager/org.apache.felix.dependencymanager/pom.xml delete mode 100644 dependencymanager/org.apache.felix.dependencymanager/test/.gitignore create mode 100644 dependencymanager/pom.xml diff --git a/dependencymanager/.gitignore b/dependencymanager/.gitignore index 43e206aada..87ec39ae7b 100644 --- a/dependencymanager/.gitignore +++ b/dependencymanager/.gitignore @@ -9,3 +9,5 @@ /build/ /cnf/localrepo/ /cnf/releaserepo/ +/target/ +**/target/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.annotation/pom.xml new file mode 100644 index 0000000000..4fb70caa65 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/pom.xml @@ -0,0 +1,88 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.annotation + 6.0.0-SNAPSHOT + bundle + + Apache Felix Dependency Manager Annotations + Annotations for Apache Felix Dependency Manager + + + scm:git:https://github.com/apache/felix-dev.git + scm:git:https://github.com/apache/felix-dev.git + https://gitbox.apache.org/repos/asf?p=felix-dev.git;f=dependencymanager/org.apache.felix.dependencymanager.annotation + HEAD + + + + + org.osgi + osgi.core + + + org.osgi + osgi.cmpn + + + biz.aQute.bnd + biz.aQute.bndlib + ${bnd.version} + provided + + + + + src + test + + + + src + + **/packageinfo + + + + + + org.apache.felix + maven-bundle-plugin + + + META-INF/=resources/,META-INF/changelog.txt=changelog.txt + org.apache.felix.dm.annotation.plugin.bnd + org.apache.felix.dm.annotation.api + https://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations.html + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.lambda/pom.xml new file mode 100644 index 0000000000..8c45ba5b96 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda/pom.xml @@ -0,0 +1,93 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.lambda + 2.0.0-SNAPSHOT + bundle + + Apache Felix Dependency Manager Lambda + Apache Felix Dependency Manager Java 8+ lambda based API + + + scm:git:https://github.com/apache/felix-dev.git + scm:git:https://github.com/apache/felix-dev.git + https://gitbox.apache.org/repos/asf?p=felix-dev.git;f=dependencymanager/org.apache.felix.dependencymanager.lambda + HEAD + + + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + org.osgi + osgi.core + + + org.osgi + osgi.cmpn + + + org.osgi + osgi.annotation + + + + + src + test + + + + src + + **/packageinfo + + + + + + org.apache.felix + maven-bundle-plugin + + + META-INF/=resources/,META-INF/changelog.txt=changelog.txt + + org.apache.felix.dm.lambda, + org.apache.felix.dm.lambda.callbacks + + org.apache.felix.dm.lambda.impl + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.runtime/pom.xml new file mode 100644 index 0000000000..b04d98ac35 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/pom.xml @@ -0,0 +1,89 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.runtime + 5.0.0-SNAPSHOT + bundle + + Apache Felix Dependency Manager Runtime + Loads Apache Felix Dependency Manager component descriptors from active annotated bundles + + + scm:git:https://github.com/apache/felix-dev.git + scm:git:https://github.com/apache/felix-dev.git + https://gitbox.apache.org/repos/asf?p=felix-dev.git;f=dependencymanager/org.apache.felix.dependencymanager.runtime + HEAD + + + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + org.osgi + osgi.core + + + org.osgi + osgi.cmpn + + + + + src + test + + + + src + + **/packageinfo + + + + + + org.apache.felix + maven-bundle-plugin + + + META-INF/=resources/,META-INF/changelog.txt=changelog.txt + org.apache.felix.dm.runtime.Activator + org.apache.felix.dm.runtime + org.apache.felix.dm.runtime.api + osgi.extender; osgi.extender="org.apache.felix.dependencymanager.runtime"; uses:="org.apache.felix.dm"; version:Version="4.0.0" + https://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.shell/pom.xml new file mode 100644 index 0000000000..3dca727d9a --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.shell/pom.xml @@ -0,0 +1,101 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.shell + 5.0.0-SNAPSHOT + bundle + + Apache Felix Dependency Manager Shell + Gogo Shell commands for Apache Felix Dependency Manager + + + scm:git:https://github.com/apache/felix-dev.git + scm:git:https://github.com/apache/felix-dev.git + https://gitbox.apache.org/repos/asf?p=felix-dev.git;f=dependencymanager/org.apache.felix.dependencymanager.shell + HEAD + + + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + org.osgi + osgi.core + + + org.osgi + osgi.cmpn + + + org.apache.felix + org.apache.felix.gogo.runtime + ${gogo.runtime.version} + provided + + + junit + junit + + + org.mockito + mockito-core + + + + + src + test + + + + src + + **/packageinfo + + + + + + org.apache.felix + maven-bundle-plugin + + + META-INF/=resources/,META-INF/changelog.txt=changelog.txt + + org.apache.felix.dm.shell + org.apache.felix.dm.shell.Activator + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager/pom.xml b/dependencymanager/org.apache.felix.dependencymanager/pom.xml new file mode 100644 index 0000000000..06423719b8 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager/pom.xml @@ -0,0 +1,110 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager + 5.0.0-SNAPSHOT + bundle + + Apache Felix Dependency Manager + Provides dynamic service and component dependency management + + + scm:git:https://github.com/apache/felix-dev.git + scm:git:https://github.com/apache/felix-dev.git + https://gitbox.apache.org/repos/asf?p=felix-dev.git;f=dependencymanager/org.apache.felix.dependencymanager + HEAD + + + + + org.osgi + osgi.core + + + org.osgi + osgi.cmpn + + + org.osgi + osgi.annotation + + + junit + junit + + + org.mockito + mockito-core + + + + + src + test + + + + src + + **/packageinfo + + + + + + org.apache.felix + maven-bundle-plugin + + + META-INF/=resources/,META-INF/changelog.txt=changelog.txt + + org.apache.felix.dm.impl, + org.apache.felix.dm.impl.index, + org.apache.felix.dm.impl.index.multiproperty, + org.apache.felix.dm.impl.metatype + + + org.apache.felix.dm, + org.apache.felix.dm.compat, + org.apache.felix.dm.tracker, + org.apache.felix.dm.context, + org.apache.felix.dm.diagnostics + + + org.osgi.framework;version="[1.8,2)", + * + + org.apache.felix.dm.impl.Activator + https://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager/test/.gitignore b/dependencymanager/org.apache.felix.dependencymanager/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager/test/org/apache/felix/dm/tracker/TrackedTest.java b/dependencymanager/org.apache.felix.dependencymanager/test/org/apache/felix/dm/tracker/TrackedTest.java index 432e27045b..c1755cb7a4 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/test/org/apache/felix/dm/tracker/TrackedTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager/test/org/apache/felix/dm/tracker/TrackedTest.java @@ -255,14 +255,12 @@ public Bundle getBundle() { return null; } - @Override - @SuppressWarnings("rawtypes") + @SuppressWarnings("rawtypes") public java.util.Dictionary getProperties() { return null; } - @Override - @SuppressWarnings("rawtypes") + @SuppressWarnings("rawtypes") public Object adapt(Class type) { return null; } diff --git a/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java b/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java index aff6950240..114ac12ef0 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java +++ b/dependencymanager/org.apache.felix.dependencymanager/test/test/MultiPropertyFilterIndexReferencedTest.java @@ -281,14 +281,12 @@ public Bundle getBundle() { return null; } - @Override - @SuppressWarnings("rawtypes") + @SuppressWarnings("rawtypes") public java.util.Dictionary getProperties() { return null; } - @Override - @SuppressWarnings("rawtypes") + @SuppressWarnings("rawtypes") public Object adapt(Class type) { return null; } diff --git a/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java b/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java index a90c702eb4..7cfdbeb8b3 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java +++ b/dependencymanager/org.apache.felix.dependencymanager/test/test/TestReference.java @@ -69,14 +69,12 @@ public Bundle getBundle() { return null; } - @Override - @SuppressWarnings("rawtypes") + @SuppressWarnings("rawtypes") public java.util.Dictionary getProperties() { return null; } - @Override - @SuppressWarnings("rawtypes") + @SuppressWarnings("rawtypes") public Object adapt(Class type) { return null; } diff --git a/dependencymanager/pom.xml b/dependencymanager/pom.xml new file mode 100644 index 0000000000..db1d967f05 --- /dev/null +++ b/dependencymanager/pom.xml @@ -0,0 +1,142 @@ + + + + 4.0.0 + + + org.apache.felix + felix-parent + 9 + + + + dependencymanager-parent + 1.0.0-SNAPSHOT + pom + + Apache Felix Dependency Manager + Apache Felix Dependency Manager Subproject + https://felix.apache.org/ + + + scm:git:https://github.com/apache/felix-dev.git + scm:git:https://github.com/apache/felix-dev.git + https://gitbox.apache.org/repos/asf?p=felix-dev.git;f=dependencymanager + HEAD + + + + org.apache.felix.dependencymanager + org.apache.felix.dependencymanager.annotation + org.apache.felix.dependencymanager.runtime + org.apache.felix.dependencymanager.shell + org.apache.felix.dependencymanager.lambda + + + + 11 + 2026-10-24T00:00:00Z + + 6.0.0 + 6.0.0 + 6.0.1 + 4.13.2 + 5.24.0 + 7.4.0 + 5.0.0-SNAPSHOT + 1.2.0-SNAPSHOT + + + + + + org.osgi + osgi.core + ${osgi.core.version} + provided + + + org.osgi + osgi.cmpn + ${osgi.cmpn.version} + provided + + + org.osgi + osgi.annotation + ${osgi.annotation.version} + provided + + + junit + junit + ${junit.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + + + + + + + org.apache.rat + apache-rat-plugin + + + + **/packageinfo + + + + + org.apache.felix + maven-bundle-plugin + 6.0.2 + true + + + ${project.artifactId} + The Apache Software Foundation + osgi + https://www.apache.org/licenses/LICENSE-2.0.txt + <_reproducible>true + <_removeheaders>Bnd-LastModified,Tool,Created-By + + + + + baseline + + baseline + + + + + + + + From f25c865841b7c8bf0f6221d2037196a7859b6378 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 24 Oct 2026 20:17:36 +0000 Subject: [PATCH 10/12] FELIX-6872 - Dependency Manager: run the integration tests with Maven Split the integration test projects into one module per bundle (the itest api, bundle and bundle2, the filter index tests and its static and dynamic custom index bundles, the lambda tests and lifecycle bundle, and the runtime tests), built with the maven-bundle-plugin. The tests run inside framework 8 with the bnd-testing-maven-plugin, which resolves the runtime (framework 8, Gogo, Config Admin, Log, Metatype and JUnit) from the Maven dependencies, as the bnd test runs did. The runtime tests process their annotations with the annotation bnd plugin. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- .../pom.xml | 77 +++++++++ .../DynamicCustomFilterIndex.java | 0 .../pom.xml | 78 +++++++++ .../StaticCustomFilterIndex.java | 0 .../pom.xml | 144 ++++++++++++++++ .../itest/tests/DynamicCustomIndexTest.java | 0 .../felix/dm/index/itest/tests/Ensure.java | 0 .../FELIX3008_FilterIndexStartupTest.java | 0 .../FELIX3057_EmptyServiceReferenceArray.java | 0 .../tests/FilterIndexResourceAdapterTest.java | 0 .../index/itest/tests/ResourceProvider.java | 0 .../itest/tests/StaticCustomIndexTest.java | 0 .../felix/dm/index/itest/tests/TestBase.java | 0 .../test.bndrun} | 45 ++--- .../.classpath | 12 -- .../.gitignore | 3 - .../.project | 23 --- .../dynamic.customindex.bnd | 24 --- .../static.customindex.bnd | 23 --- .../test/.gitignore | 0 .../tests.bnd | 21 --- .../pom.xml | 157 ++++++++++++++++++ .../api/AbstractServiceDependencyTest.java | 0 .../dm/itest/api/AdapterAndConsumerTest.java | 0 ...rNoAutoConfigIfInstanceCallbackIsUsed.java | 0 .../felix/dm/itest/api/AdapterTest.java | 0 .../api/AdapterWithCallbackInstanceTest.java | 0 .../AdapterWithConfigurationAndMetaType.java | 0 .../api/AdapterWithExtraDependenciesTest.java | 0 ...thInstanceBoundDependencyParallelTest.java | 0 ...dapterWithInstanceBoundDependencyTest.java | 0 ...thModifiedInstanceBoundDependencyTest.java | 0 .../itest/api/AdapterWithPropagationTest.java | 0 .../api/AdapterWithoutPropagationTest.java | 0 .../felix/dm/itest/api/AspectBaseTest.java | 0 .../felix/dm/itest/api/AspectChainTest.java | 0 .../dm/itest/api/AspectDynamicsTest.java | 0 ...lwaysInjectedWithRequiredDependencies.java | 0 .../dm/itest/api/AspectRaceParallelTest.java | 0 .../felix/dm/itest/api/AspectRaceTest.java | 0 .../api/AspectServiceDependencyTest.java | 0 ...ServiceDependencyWithSwapCallbackTest.java | 0 .../dm/itest/api/AspectWhiteboardTest.java | 0 ...ectWithCallbacksServiceDependencyTest.java | 0 .../itest/api/AspectWithPropagationTest.java | 0 .../felix/dm/itest/api/AutoConfigTest.java | 0 .../felix/dm/itest/api/BundleAdapterTest.java | 0 ...terWithCallbacksNotAutoConfiguredTest.java | 0 .../dm/itest/api/BundleDependencyTest.java | 0 .../itest/api/ComponentStateListenerTest.java | 0 .../felix/dm/itest/api/ComponentTest.java | 0 .../felix/dm/itest/api/ComponentTracker.java | 0 .../felix/dm/itest/api/CompositionTest.java | 0 .../dm/itest/api/ConfigurationCreator.java | 0 .../api/ConfigurationDependencyTest.java | 0 .../felix/dm/itest/api/DiagnosticsTest.java | 0 .../dm/itest/api/DynamicProxyAspectTest.java | 0 .../itest/api/DynamicScopedServiceTest.java | 0 ...55_AdapterCallbackInstanceCalledTwice.java | 0 .../api/FELIX2078_ServiceDependencyTest.java | 0 ...344_ExtraDependencyWithAutoConfigTest.java | 0 ...X2344_ExtraDependencyWithCallbackTest.java | 0 .../api/FELIX2348_ResourceAdapterTest.java | 0 .../api/FELIX2369_ExtraDependencyTest.java | 0 ...ConfigurationAndServiceDependencyTest.java | 0 ...rviceDependencyWithoutServiceNameTest.java | 0 .../itest/api/FELIX2955_ShellCommandTest.java | 0 ...gurationDependencyWithPropagationTest.java | 0 .../FELIX4158_DependencyDeclarationTest.java | 0 ...IX4361_ConcurrentComponentListingTest.java | 0 ...614_FactoryWithComponentInCreateParam.java | 0 .../api/FELIX4869_CallbackNotCalled.java | 0 ...4913_OptionalCallbackInvokedTwiceTest.java | 0 ...onalDependencyCBCalledBeforeStartTest.java | 0 ...nupInstanceBoundDependenciesInDestroy.java | 0 .../FELIX5153_StopBeforeUngetServiceTest.java | 0 .../FELIX5200_FactoryPidNotRestartedTest.java | 0 ...8_TypeSafeConfigWithDefaultMethodTest.java | 0 ...dateMissedIfComponentIsRestartingTest.java | 0 .../api/FELIX5268_AddRemoveServiceTest.java | 0 ...nupInstanceBoundDependenciesInDestroy.java | 0 ...irectInjectionShouldSeeServiceUpdates.java | 0 .../FELIX5355_ConfigTypesWithDotsTest.java | 0 .../api/FELIX5399_DefaultListConfigType.java | 0 .../api/FELIX5399_DefaultMapConfigType.java | 0 ...rideDefaultMapConfigTypeWithEmptyList.java | 0 ...rideDefaultListConfigTypeWithEmptyMap.java | 0 ...LIX5426_OptionalCallbackNotCalledTest.java | 0 ...6_OptionalChangeCallbackNotCalledTest.java | 0 ...nupDependenciesWhenComponentIsStopped.java | 0 ...CallbackNotCalledForOptionalDepenency.java | 0 .../api/FELIX5471_CyclicDependencyTest.java | 0 .../api/FELIX5471_SynchronousUnbindTest.java | 0 .../itest/api/FELIX5630_NullObjectTest.java | 0 ...ServicePropertiesToAspectInitCallback.java | 0 ...3_GetServicePropertiesReturnsNullTest.java | 0 ...apterWithDynamicallyAddedDependencies.java | 0 .../api/FactoryComponentWithMetaTypeTest.java | 0 .../api/FactoryConfigurationAdapterTest.java | 0 .../api/FactoryConfigurationCreator.java | 0 ...ithConfigurationBeforeTheCreateMethod.java | 0 .../api/InstanceBoundDependencyTest.java | 0 .../api/ModifiedBundleDependencyTest.java | 0 .../api/MultipleExtraDependenciesTest.java | 0 .../api/MultipleExtraDependencyTest.java | 0 .../api/MultipleExtraDependencyTest2.java | 0 .../api/MultipleServiceDependencyTest.java | 0 .../OptionalConfigurationDependencyTest.java | 0 .../dm/itest/api/RemovedDependencyTest.java | 0 ...urceAdapterDependencyAddAndRemoveTest.java | 0 ...rceAdapterDependencyAddAndRemoveTest2.java | 0 .../dm/itest/api/ResourceAdapterTest.java | 0 .../dm/itest/api/ResourceDependencyTest.java | 0 .../felix/dm/itest/api/ResourceProvider.java | 0 .../api/ScopedAspectAdaptersServiceTest.java | 0 ...ServiceReferenceAndServiceObjectsTest.java | 0 .../felix/dm/itest/api/ScopedServiceTest.java | 0 ...edServiceUnexpectedlyInstantiatedTest.java | 0 ...rviceDependencyCallbackSignaturesTest.java | 0 .../api/ServiceDependencyInjectionTest.java | 0 .../api/ServiceDependencyPropagateTest.java | 0 .../dm/itest/api/ServiceDependencyTest.java | 0 ...DependencyThroughCallbackInstanceTest.java | 0 .../dm/itest/api/ServiceRaceParallelTest.java | 0 ...viceRaceParallelWithOrderedUnbindTest.java | 0 .../felix/dm/itest/api/ServiceRaceTest.java | 0 .../api/ServiceRaceWithOrderedUnbindTest.java | 0 .../dm/itest/api/ServiceTrackerTest.java | 0 .../felix/dm/itest/api/ServiceUpdateTest.java | 0 .../api/TemporalServiceDependencyTest.java | 0 .../dm/itest/api/UngetAspectServiceTest.java | 0 .../felix/dm/itest/api/UngetServiceTest.java | 0 .../felix/dm/itest/util/ConfigDeliveries.java | 0 .../apache/felix/dm/itest/util/Ensure.java | 0 .../felix/dm/itest/util/ServiceUtil.java | 0 .../apache/felix/dm/itest/util/TestBase.java | 0 .../apache/felix/dm/itest/util/packageinfo | 0 .../test.bndrun | 38 +++++ .../pom.xml | 78 +++++++++ .../felix/dm/itest/bundle/Activator.java | 0 .../felix/dm/itest/bundle/HelloWorld.java | 0 .../dm/itest/bundle/HelloWorldService.java | 0 .../bundle/HelloWorldServiceFactory.java | 0 .../felix/dm/itest/bundle/TestComponent.java | 0 .../felix/dm/itest/bundle/TestService.java | 0 .../pom.xml | 78 +++++++++ .../felix/dm/itest/bundle2/Activator.java | 0 .../dm/itest/bundle2/AddRemoveService.java | 0 .../apache/felix/dm/itest/bundle2/packageinfo | 0 .../.classpath | 12 -- .../.gitignore | 3 - .../.project | 23 --- .../api.bnd | 25 --- .../bnd.bnd | 55 ------ .../bundle.bnd | 25 --- .../bundle2.bnd | 19 --- .../test/.gitignore | 0 .../pom.xml | 138 +++++++++++++++ .../dm/lambda/itest/lifecycle/Activator.java | 0 .../itest/lifecycle/SimpleComponent.java | 0 .../pom.xml | 152 +++++++++++++++++ .../itest/AbstractServiceDependencyTest.java | 0 .../lambda/itest/AdapterAndConsumerTest.java | 0 ...rNoAutoConfigIfInstanceCallbackIsUsed.java | 0 .../AdapterWithCallbackInstanceTest.java | 0 .../AdapterWithExtraDependenciesTest.java | 0 ...thInstanceBoundDependencyParallelTest.java | 0 ...dapterWithInstanceBoundDependencyTest.java | 0 ...thModifiedInstanceBoundDependencyTest.java | 0 .../itest/AdapterWithPropagationTest.java | 0 .../itest/AdapterWithoutPropagationTest.java | 0 .../felix/dm/lambda/itest/AspectBaseTest.java | 0 .../dm/lambda/itest/AspectChainTest.java | 0 .../dm/lambda/itest/AspectDynamicsTest.java | 0 .../itest/AspectServiceDependencyTest.java | 0 ...ServiceDependencyWithSwapCallbackTest.java | 0 .../dm/lambda/itest/AspectWhiteboardTest.java | 0 ...ectWithCallbacksServiceDependencyTest.java | 0 .../itest/AspectWithPropagationTest.java | 0 .../felix/dm/lambda/itest/AutoConfigTest.java | 0 .../dm/lambda/itest/BundleAdapterTest.java | 0 ...terWithCallbacksNotAutoConfiguredTest.java | 0 .../dm/lambda/itest/BundleDependencyTest.java | 0 .../dm/lambda/itest/CFDependencyTest.java | 0 .../felix/dm/lambda/itest/ComponentTest.java | 0 .../dm/lambda/itest/CompositionTest.java | 0 .../lambda/itest/DynamicProxyAspectTest.java | 0 .../itest/DynamicScopedServiceTest.java | 0 .../apache/felix/dm/lambda/itest/Ensure.java | 0 .../FELIX5406_FluentPropertyWithDotTest.java | 0 .../felix/dm/lambda/itest/FELIX5516Test.java | 0 .../FactoryConfigurationAdapterTest.java | 0 .../itest/FactoryConfigurationCreator.java | 0 ...ithConfigurationBeforeTheCreateMethod.java | 0 .../felix/dm/lambda/itest/Felix5244Test.java | 0 .../itest/InstanceBoundDependencyTest.java | 0 .../itest/ModifiedBundleDependencyTest.java | 0 .../itest/MultipleExtraDependenciesTest.java | 0 .../itest/MultipleExtraDependencyTest.java | 0 .../itest/MultipleExtraDependencyTest2.java | 0 .../itest/MultipleServiceDependencyTest.java | 0 .../itest/OptionalConfigurationTest.java | 0 .../lambda/itest/RemovedDependencyTest.java | 0 .../dm/lambda/itest/ResourceProvider.java | 0 ...ServiceReferenceAndServiceObjectsTest.java | 0 .../dm/lambda/itest/ScopedServiceTest.java | 0 ...rviceDependencyCallbackSignaturesTest.java | 0 .../itest/ServiceDependencyInjectionTest.java | 0 .../itest/ServiceDependencyPropagateTest.java | 0 .../lambda/itest/ServiceDependencyTest.java | 0 ...DependencyThroughCallbackInstanceTest.java | 0 .../dm/lambda/itest/ServiceUpdateTest.java | 0 .../felix/dm/lambda/itest/ServiceUtil.java | 0 .../dm/lambda/itest/StopCallbackTest.java | 0 .../itest/TemporalServiceDependencyTest.java | 0 .../felix/dm/lambda/itest/TestBase.java | 0 .../test.bndrun} | 48 ++---- .../.classpath | 12 -- .../.gitignore | 3 - .../.project | 23 --- .../.settings/org.eclipse.jdt.core.prefs | 12 -- .../build.gradle | 22 --- .../lifecycle.bnd | 18 -- .../test/.keepme | 0 .../tests.bnd | 18 -- .../.classpath | 12 -- .../.gitignore | 3 - .../.project | 23 --- .../bnd.bnd | 66 -------- .../pom.xml | 155 +++++++++++++++++ .../test.bndrun | 35 ++++ .../test/.gitignore | 0 dependencymanager/pom.xml | 49 +++++- 233 files changed, 1206 insertions(+), 546 deletions(-) create mode 100644 dependencymanager/org.apache.felix.dependencymanager.index.itest.dynamic.customindex/pom.xml rename dependencymanager/{org.apache.felix.dependencymanager.index.itest => org.apache.felix.dependencymanager.index.itest.dynamic.customindex}/src/org/apache/felix/dm/index/itest/dynamiccustomindex/DynamicCustomFilterIndex.java (100%) create mode 100644 dependencymanager/org.apache.felix.dependencymanager.index.itest.static.customindex/pom.xml rename dependencymanager/{org.apache.felix.dependencymanager.index.itest => org.apache.felix.dependencymanager.index.itest.static.customindex}/src/org/apache/felix/dm/index/itest/staticcustomindex/StaticCustomFilterIndex.java (100%) create mode 100644 dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/pom.xml rename dependencymanager/{org.apache.felix.dependencymanager.index.itest => org.apache.felix.dependencymanager.index.itest.tests}/src/org/apache/felix/dm/index/itest/tests/DynamicCustomIndexTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.index.itest => org.apache.felix.dependencymanager.index.itest.tests}/src/org/apache/felix/dm/index/itest/tests/Ensure.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.index.itest => org.apache.felix.dependencymanager.index.itest.tests}/src/org/apache/felix/dm/index/itest/tests/FELIX3008_FilterIndexStartupTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.index.itest => org.apache.felix.dependencymanager.index.itest.tests}/src/org/apache/felix/dm/index/itest/tests/FELIX3057_EmptyServiceReferenceArray.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.index.itest => org.apache.felix.dependencymanager.index.itest.tests}/src/org/apache/felix/dm/index/itest/tests/FilterIndexResourceAdapterTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.index.itest => org.apache.felix.dependencymanager.index.itest.tests}/src/org/apache/felix/dm/index/itest/tests/ResourceProvider.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.index.itest => org.apache.felix.dependencymanager.index.itest.tests}/src/org/apache/felix/dm/index/itest/tests/StaticCustomIndexTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.index.itest => org.apache.felix.dependencymanager.index.itest.tests}/src/org/apache/felix/dm/index/itest/tests/TestBase.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.index.itest/bnd.bnd => org.apache.felix.dependencymanager.index.itest.tests/test.bndrun} (50%) delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.index.itest/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.index.itest/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.index.itest/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.index.itest/dynamic.customindex.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.index.itest/static.customindex.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.index.itest/test/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.index.itest/tests.bnd create mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest.api/pom.xml rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AbstractServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AdapterAndConsumerTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AdapterTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AdapterWithCallbackInstanceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AdapterWithConfigurationAndMetaType.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AdapterWithExtraDependenciesTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyParallelTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AdapterWithModifiedInstanceBoundDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AdapterWithPropagationTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AdapterWithoutPropagationTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AspectBaseTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AspectChainTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AspectDynamicsTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AspectNotAlwaysInjectedWithRequiredDependencies.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AspectRaceParallelTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AspectRaceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AspectServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AspectServiceDependencyWithSwapCallbackTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AspectWhiteboardTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AspectWithCallbacksServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AspectWithPropagationTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/AutoConfigTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/BundleAdapterTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/BundleAdapterWithCallbacksNotAutoConfiguredTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/BundleDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ComponentStateListenerTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ComponentTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ComponentTracker.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/CompositionTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ConfigurationCreator.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/DiagnosticsTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/DynamicProxyAspectTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/DynamicScopedServiceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELI5155_AdapterCallbackInstanceCalledTwice.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX2078_ServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithCallbackTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX2348_ResourceAdapterTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX2369_ExtraDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX2696_ConfigurationAndServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX2875_ServiceDependencyWithoutServiceNameTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX2955_ShellCommandTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX4158_DependencyDeclarationTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX4361_ConcurrentComponentListingTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX4614_FactoryWithComponentInCreateParam.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX4869_CallbackNotCalled.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX4913_OptionalCallbackInvokedTwiceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5045_OptionalDependencyCBCalledBeforeStartTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5054_CleanupInstanceBoundDependenciesInDestroy.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5153_StopBeforeUngetServiceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5243_ConfigUpdateMissedIfComponentIsRestartingTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5268_AddRemoveServiceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5274_CleanupInstanceBoundDependenciesInDestroy.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5305_DirectInjectionShouldSeeServiceUpdates.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5355_ConfigTypesWithDotsTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5399_DefaultListConfigType.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5399_DefaultMapConfigType.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5400_OverrideDefaultMapConfigTypeWithEmptyList.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5401_OverrideDefaultListConfigTypeWithEmptyMap.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5426_OptionalCallbackNotCalledTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5426_OptionalChangeCallbackNotCalledTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5428_CleanupDependenciesWhenComponentIsStopped.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5429_AspectSwapCallbackNotCalledForOptionalDepenency.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5471_CyclicDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5471_SynchronousUnbindTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5630_NullObjectTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5636_PropagateServicePropertiesToAspectInitCallback.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX5683_GetServicePropertiesReturnsNullTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FELIX_4168AdapterWithDynamicallyAddedDependencies.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FactoryComponentWithMetaTypeTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FactoryConfigurationAdapterTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FactoryConfigurationCreator.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/InstanceBoundDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ModifiedBundleDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/MultipleExtraDependenciesTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest2.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/MultipleServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/RemovedDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest2.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ResourceAdapterTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ResourceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ResourceProvider.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ScopedAspectAdaptersServiceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ScopedServiceReferenceAndServiceObjectsTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ScopedServiceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ScopedServiceUnexpectedlyInstantiatedTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ServiceDependencyCallbackSignaturesTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ServiceDependencyInjectionTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ServiceDependencyPropagateTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ServiceDependencyThroughCallbackInstanceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ServiceRaceParallelTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ServiceRaceParallelWithOrderedUnbindTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ServiceRaceWithOrderedUnbindTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ServiceTrackerTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/ServiceUpdateTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/TemporalServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/UngetAspectServiceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/api/UngetServiceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/util/ConfigDeliveries.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/util/Ensure.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/util/ServiceUtil.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/util/TestBase.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.api}/src/org/apache/felix/dm/itest/util/packageinfo (100%) create mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest.api/test.bndrun create mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest.bundle/pom.xml rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.bundle}/src/org/apache/felix/dm/itest/bundle/Activator.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.bundle}/src/org/apache/felix/dm/itest/bundle/HelloWorld.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.bundle}/src/org/apache/felix/dm/itest/bundle/HelloWorldService.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.bundle}/src/org/apache/felix/dm/itest/bundle/HelloWorldServiceFactory.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.bundle}/src/org/apache/felix/dm/itest/bundle/TestComponent.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.bundle}/src/org/apache/felix/dm/itest/bundle/TestService.java (100%) create mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest.bundle2/pom.xml rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.bundle2}/src/org/apache/felix/dm/itest/bundle2/Activator.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.bundle2}/src/org/apache/felix/dm/itest/bundle2/AddRemoveService.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.itest => org.apache.felix.dependencymanager.itest.bundle2}/src/org/apache/felix/dm/itest/bundle2/packageinfo (100%) delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest/api.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest/bundle.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest/bundle2.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.itest/test/.gitignore create mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.itest.lifecycle/pom.xml rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.lifecycle}/src/org/apache/felix/dm/lambda/itest/lifecycle/Activator.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.lifecycle}/src/org/apache/felix/dm/lambda/itest/lifecycle/SimpleComponent.java (100%) create mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/pom.xml rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AbstractServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AdapterAndConsumerTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AdapterWithExtraDependenciesTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyParallelTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AdapterWithPropagationTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AspectChainTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AspectDynamicsTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AspectWhiteboardTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AspectWithCallbacksServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AspectWithPropagationTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/BundleAdapterTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/BundleDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/CFDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ComponentTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/CompositionTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/DynamicProxyAspectTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/DynamicScopedServiceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/Ensure.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/FELIX5406_FluentPropertyWithDotTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/FELIX5516Test.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationAdapterTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationCreator.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/Felix5244Test.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/InstanceBoundDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ModifiedBundleDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependenciesTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest2.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/MultipleServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/OptionalConfigurationTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/RemovedDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ResourceProvider.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ScopedServiceReferenceAndServiceObjectsTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ScopedServiceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ServiceDependencyCallbackSignaturesTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ServiceDependencyInjectionTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ServiceDependencyPropagateTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ServiceDependencyThroughCallbackInstanceTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ServiceUpdateTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/ServiceUtil.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/StopCallbackTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/TemporalServiceDependencyTest.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest => org.apache.felix.dependencymanager.lambda.itest.tests}/src/org/apache/felix/dm/lambda/itest/TestBase.java (100%) rename dependencymanager/{org.apache.felix.dependencymanager.lambda.itest/bnd.bnd => org.apache.felix.dependencymanager.lambda.itest.tests/test.bndrun} (51%) delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.settings/org.eclipse.jdt.core.prefs delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.itest/build.gradle delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.itest/lifecycle.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.itest/test/.keepme delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.itest/tests.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd create mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime.itest/pom.xml create mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime.itest/test.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime.itest/test/.gitignore diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest.dynamic.customindex/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.index.itest.dynamic.customindex/pom.xml new file mode 100644 index 0000000000..d0598b159f --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.index.itest.dynamic.customindex/pom.xml @@ -0,0 +1,77 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.index.itest.dynamic.customindex + bundle + + Apache Felix Dependency Manager integration tests Dynamic Custom Index + Dynamic custom filter index used by the Apache Felix Dependency Manager integration tests + + + + true + true + + + + + org.osgi + osgi.core + 8.0.0 + + + org.osgi + osgi.cmpn + 7.0.0 + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + + + src + + + org.apache.felix + maven-bundle-plugin + + + test + org.apache.felix.dm.index.itest.dynamiccustomindex + org.apache.felix.dm.impl.index.multiproperty + * + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/dynamiccustomindex/DynamicCustomFilterIndex.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest.dynamic.customindex/src/org/apache/felix/dm/index/itest/dynamiccustomindex/DynamicCustomFilterIndex.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/dynamiccustomindex/DynamicCustomFilterIndex.java rename to dependencymanager/org.apache.felix.dependencymanager.index.itest.dynamic.customindex/src/org/apache/felix/dm/index/itest/dynamiccustomindex/DynamicCustomFilterIndex.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest.static.customindex/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.index.itest.static.customindex/pom.xml new file mode 100644 index 0000000000..5d41ad7fc4 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.index.itest.static.customindex/pom.xml @@ -0,0 +1,78 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.index.itest.static.customindex + bundle + + Apache Felix Dependency Manager integration tests Static Custom Index + Static custom filter index used by the Apache Felix Dependency Manager integration tests + + + + true + true + + + + + org.osgi + osgi.core + 8.0.0 + + + org.osgi + osgi.cmpn + 7.0.0 + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + + + src + + + org.apache.felix + maven-bundle-plugin + + + test + org.apache.felix.dependencymanager + org.apache.felix.dm.index.itest.staticcustomindex + + !org.apache.felix.dm.*,* + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/staticcustomindex/StaticCustomFilterIndex.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest.static.customindex/src/org/apache/felix/dm/index/itest/staticcustomindex/StaticCustomFilterIndex.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/staticcustomindex/StaticCustomFilterIndex.java rename to dependencymanager/org.apache.felix.dependencymanager.index.itest.static.customindex/src/org/apache/felix/dm/index/itest/staticcustomindex/StaticCustomFilterIndex.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/pom.xml new file mode 100644 index 0000000000..a39dc76cbc --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/pom.xml @@ -0,0 +1,144 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.index.itest.tests + bundle + + Apache Felix Dependency Manager FilterIndex tests + Integration tests for the filter indices of Apache Felix Dependency Manager + + + + true + true + + + + + org.osgi + osgi.core + 8.0.0 + + + org.osgi + osgi.cmpn + 7.0.0 + + + junit + junit + provided + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + org.apache.felix + org.apache.felix.dependencymanager.shell + ${dependencymanager.version} + + + org.apache.felix + org.apache.felix.gogo.runtime + ${gogo.runtime.version} + + + org.apache.felix + org.apache.felix.dependencymanager.index.itest.dynamic.customindex + ${project.version} + + + org.apache.felix + org.apache.felix.dependencymanager.index.itest.static.customindex + ${project.version} + + + org.apache.felix + org.apache.felix.configadmin + ${configadmin.version} + runtime + + + org.apache.felix + org.apache.felix.log + ${log.version} + runtime + + + org.apache.felix + org.apache.felix.metatype + ${metatype.version} + runtime + + + org.apache.felix + org.apache.felix.framework + ${framework.version} + runtime + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.junit + ${servicemix.junit.version} + runtime + + + + + src + + + org.apache.felix + maven-bundle-plugin + + + test + org.apache.felix.dm.index.itest.tests + + $[classes;CONCRETE;EXTENDS;junit.framework.TestCase] + + + + + biz.aQute.bnd + bnd-testing-maven-plugin + + + ${project.build.directory}/${project.build.finalName}.jar + + + test.bndrun + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/DynamicCustomIndexTest.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/DynamicCustomIndexTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/DynamicCustomIndexTest.java rename to dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/DynamicCustomIndexTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/Ensure.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/Ensure.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/Ensure.java rename to dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/Ensure.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/FELIX3008_FilterIndexStartupTest.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/FELIX3008_FilterIndexStartupTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/FELIX3008_FilterIndexStartupTest.java rename to dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/FELIX3008_FilterIndexStartupTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/FELIX3057_EmptyServiceReferenceArray.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/FELIX3057_EmptyServiceReferenceArray.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/FELIX3057_EmptyServiceReferenceArray.java rename to dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/FELIX3057_EmptyServiceReferenceArray.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/FilterIndexResourceAdapterTest.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/FilterIndexResourceAdapterTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/FilterIndexResourceAdapterTest.java rename to dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/FilterIndexResourceAdapterTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/ResourceProvider.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/ResourceProvider.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/ResourceProvider.java rename to dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/ResourceProvider.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/StaticCustomIndexTest.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/StaticCustomIndexTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/StaticCustomIndexTest.java rename to dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/StaticCustomIndexTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/TestBase.java b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/TestBase.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.index.itest/src/org/apache/felix/dm/index/itest/tests/TestBase.java rename to dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/src/org/apache/felix/dm/index/itest/tests/TestBase.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/test.bndrun similarity index 50% rename from dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd rename to dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/test.bndrun index 8efac4401d..5d79ed17dc 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.index.itest/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.index.itest.tests/test.bndrun @@ -14,41 +14,24 @@ # See the License for the specific language governing permissions and # limitations under the License. # --runbundles: \ - org.apache.servicemix.bundles.junit;version=4.13.2,\ - org.apache.felix.metatype;version=1.2.4,\ - org.apache.felix.log;version=1.3.2,\ - org.apache.felix.configadmin;version=latest,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.index.itest.dynamic.customindex;version=latest,\ - org.apache.felix.dependencymanager.index.itest.static.customindex;version=latest,\ - org.apache.felix.dependencymanager.index.itest.tests;version=latest,\ - org.apache.felix.gogo.runtime;version=latest - +-runfw: org.apache.felix.framework;version='[8.0.0,9)' -runee: JavaSE-11 -runvm: -ea --runfw: org.apache.felix.framework;version='[8.0.0,9)' --buildpath: \ - osgi.core;version=8.0,\ - osgi.cmpn;version=7.0,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - ${junit},\ - org.apache.felix.gogo.runtime;version=latest --runsystempackages: \ - sun.reflect -Test-Cases: \ - ${classes;CONCRETE;EXTENDS;junit.framework.TestCase} --runproperties: \ +-runsystempackages: sun.reflect +-runproperties: \ org.apache.felix.dependencymanager.loglevel=2,\ org.apache.felix.log.maxSize=100000,\ org.apache.felix.log.storeDebug=true,\ gosh.args=--noshutdown,\ org.apache.felix.dependencymanager.filterindex=objectClass - -# we do not release this project in binary distribution. --releaserepo: --baseline: - --sub: *.bnd +-runrequires: \ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.index.itest.tests)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.index.itest.dynamic.customindex)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.index.itest.static.customindex)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.shell)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.runtime)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.configadmin)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.log)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.metatype)',\ + osgi.identity;filter:='(osgi.identity=org.apache.servicemix.bundles.junit)' diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/.classpath b/dependencymanager/org.apache.felix.dependencymanager.index.itest/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.index.itest/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.index.itest/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.index.itest/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/.project b/dependencymanager/org.apache.felix.dependencymanager.index.itest/.project deleted file mode 100644 index e3699c3739..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.index.itest/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager.index.itest - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/dynamic.customindex.bnd b/dependencymanager/org.apache.felix.dependencymanager.index.itest/dynamic.customindex.bnd deleted file mode 100644 index 099e509247..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.index.itest/dynamic.customindex.bnd +++ /dev/null @@ -1,24 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Export-Package: \ - org.apache.felix.dm.index.itest.dynamiccustomindex -Private-Package: \ - org.apache.felix.dm.impl.index.multiproperty -Import-Package: * -Bundle-Category: test -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Vendor: The Apache Software Foundation diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/static.customindex.bnd b/dependencymanager/org.apache.felix.dependencymanager.index.itest/static.customindex.bnd deleted file mode 100644 index cdb1d1f1ce..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.index.itest/static.customindex.bnd +++ /dev/null @@ -1,23 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: org.apache.felix.dm.index.itest.staticcustomindex -Fragment-Host: org.apache.felix.dependencymanager -Import-Package: !org.apache.felix.dm.*,* -Bundle-Name: Apache Felix Dependency Manager integration tests Static Custom Index -Bundle-Category: test -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Vendor: The Apache Software Foundation diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/test/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.index.itest/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.index.itest/tests.bnd b/dependencymanager/org.apache.felix.dependencymanager.index.itest/tests.bnd deleted file mode 100644 index a681f12e6d..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.index.itest/tests.bnd +++ /dev/null @@ -1,21 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: org.apache.felix.dm.index.itest.tests -Bundle-Name: Apache Felix Dependency Manager FilterIndex tests -Bundle-Category: test -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Vendor: The Apache Software Foundation diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest.api/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.itest.api/pom.xml new file mode 100644 index 0000000000..348a99fa31 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.itest.api/pom.xml @@ -0,0 +1,157 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.itest.api + bundle + + Apache Felix Dependency Manager integration tests + Integration tests for Apache Felix Dependency Manager + + + + true + true + + + + + org.osgi + osgi.core + 8.0.0 + + + org.osgi + osgi.cmpn + 7.0.0 + + + junit + junit + provided + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + org.apache.felix + org.apache.felix.dependencymanager.shell + ${dependencymanager.version} + + + org.apache.felix + org.apache.felix.dependencymanager.itest.bundle + ${project.version} + + + org.apache.felix + org.apache.felix.dependencymanager.itest.bundle2 + ${project.version} + + + org.apache.felix + org.apache.felix.gogo.runtime + ${gogo.runtime.version} + + + org.apache.felix + org.apache.felix.gogo.shell + ${gogo.shell.version} + runtime + + + org.apache.felix + org.apache.felix.gogo.command + ${gogo.command.version} + runtime + + + org.apache.felix + org.apache.felix.configadmin + ${configadmin.version} + runtime + + + org.apache.felix + org.apache.felix.log + ${log.version} + runtime + + + org.apache.felix + org.apache.felix.metatype + ${metatype.version} + runtime + + + org.apache.felix + org.apache.felix.framework + ${framework.version} + runtime + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.junit + ${servicemix.junit.version} + runtime + + + + + src + + + org.apache.felix + maven-bundle-plugin + + + Apache Felix Dependency Manager integration tests + test + org.apache.felix.dm.itest.api + org.apache.felix.dm.itest.util + $[classes;CONCRETE;EXTENDS;junit.framework.TestCase] + + + + + biz.aQute.bnd + bnd-testing-maven-plugin + + + ${project.build.directory}/${project.build.finalName}.jar + + + test.bndrun + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AbstractServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AbstractServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AbstractServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AbstractServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterAndConsumerTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterAndConsumerTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterAndConsumerTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterAndConsumerTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithCallbackInstanceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithCallbackInstanceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithCallbackInstanceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithCallbackInstanceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithConfigurationAndMetaType.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithConfigurationAndMetaType.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithConfigurationAndMetaType.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithConfigurationAndMetaType.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithExtraDependenciesTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithExtraDependenciesTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithExtraDependenciesTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithExtraDependenciesTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyParallelTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyParallelTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyParallelTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyParallelTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithInstanceBoundDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithModifiedInstanceBoundDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithModifiedInstanceBoundDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithModifiedInstanceBoundDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithModifiedInstanceBoundDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithPropagationTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithPropagationTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithPropagationTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithPropagationTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithoutPropagationTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithoutPropagationTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AdapterWithoutPropagationTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AdapterWithoutPropagationTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectBaseTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectBaseTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectBaseTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectBaseTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectChainTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectChainTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectChainTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectChainTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectDynamicsTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectDynamicsTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectDynamicsTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectDynamicsTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectNotAlwaysInjectedWithRequiredDependencies.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectNotAlwaysInjectedWithRequiredDependencies.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectNotAlwaysInjectedWithRequiredDependencies.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectNotAlwaysInjectedWithRequiredDependencies.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceParallelTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectRaceParallelTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceParallelTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectRaceParallelTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectRaceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectRaceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectRaceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyWithSwapCallbackTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectServiceDependencyWithSwapCallbackTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectServiceDependencyWithSwapCallbackTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectServiceDependencyWithSwapCallbackTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWhiteboardTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectWhiteboardTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWhiteboardTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectWhiteboardTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWithCallbacksServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectWithCallbacksServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWithCallbacksServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectWithCallbacksServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWithPropagationTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectWithPropagationTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AspectWithPropagationTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AspectWithPropagationTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AutoConfigTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AutoConfigTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/AutoConfigTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/AutoConfigTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/BundleAdapterTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/BundleAdapterTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/BundleAdapterTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/BundleAdapterTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/BundleAdapterWithCallbacksNotAutoConfiguredTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/BundleAdapterWithCallbacksNotAutoConfiguredTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/BundleAdapterWithCallbacksNotAutoConfiguredTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/BundleAdapterWithCallbacksNotAutoConfiguredTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/BundleDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/BundleDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/BundleDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/BundleDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ComponentStateListenerTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ComponentStateListenerTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ComponentStateListenerTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ComponentStateListenerTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ComponentTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ComponentTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ComponentTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ComponentTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ComponentTracker.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ComponentTracker.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ComponentTracker.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ComponentTracker.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/CompositionTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/CompositionTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/CompositionTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/CompositionTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationCreator.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ConfigurationCreator.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationCreator.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ConfigurationCreator.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ConfigurationDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/DiagnosticsTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/DiagnosticsTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/DiagnosticsTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/DiagnosticsTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/DynamicProxyAspectTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/DynamicProxyAspectTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/DynamicProxyAspectTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/DynamicProxyAspectTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/DynamicScopedServiceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/DynamicScopedServiceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/DynamicScopedServiceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/DynamicScopedServiceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELI5155_AdapterCallbackInstanceCalledTwice.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELI5155_AdapterCallbackInstanceCalledTwice.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELI5155_AdapterCallbackInstanceCalledTwice.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELI5155_AdapterCallbackInstanceCalledTwice.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2078_ServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2078_ServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2078_ServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2078_ServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithCallbackTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithCallbackTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithCallbackTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2344_ExtraDependencyWithCallbackTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2348_ResourceAdapterTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2348_ResourceAdapterTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2348_ResourceAdapterTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2348_ResourceAdapterTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2369_ExtraDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2369_ExtraDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2369_ExtraDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2369_ExtraDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2696_ConfigurationAndServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2696_ConfigurationAndServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2696_ConfigurationAndServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2696_ConfigurationAndServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2875_ServiceDependencyWithoutServiceNameTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2875_ServiceDependencyWithoutServiceNameTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2875_ServiceDependencyWithoutServiceNameTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2875_ServiceDependencyWithoutServiceNameTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2955_ShellCommandTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2955_ShellCommandTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX2955_ShellCommandTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX2955_ShellCommandTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4158_DependencyDeclarationTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX4158_DependencyDeclarationTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4158_DependencyDeclarationTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX4158_DependencyDeclarationTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4361_ConcurrentComponentListingTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX4361_ConcurrentComponentListingTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4361_ConcurrentComponentListingTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX4361_ConcurrentComponentListingTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4614_FactoryWithComponentInCreateParam.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX4614_FactoryWithComponentInCreateParam.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4614_FactoryWithComponentInCreateParam.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX4614_FactoryWithComponentInCreateParam.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4869_CallbackNotCalled.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX4869_CallbackNotCalled.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4869_CallbackNotCalled.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX4869_CallbackNotCalled.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4913_OptionalCallbackInvokedTwiceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX4913_OptionalCallbackInvokedTwiceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX4913_OptionalCallbackInvokedTwiceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX4913_OptionalCallbackInvokedTwiceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5045_OptionalDependencyCBCalledBeforeStartTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5045_OptionalDependencyCBCalledBeforeStartTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5045_OptionalDependencyCBCalledBeforeStartTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5045_OptionalDependencyCBCalledBeforeStartTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5054_CleanupInstanceBoundDependenciesInDestroy.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5054_CleanupInstanceBoundDependenciesInDestroy.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5054_CleanupInstanceBoundDependenciesInDestroy.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5054_CleanupInstanceBoundDependenciesInDestroy.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5153_StopBeforeUngetServiceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5153_StopBeforeUngetServiceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5153_StopBeforeUngetServiceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5153_StopBeforeUngetServiceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5200_FactoryPidNotRestartedTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5238_TypeSafeConfigWithDefaultMethodTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5243_ConfigUpdateMissedIfComponentIsRestartingTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5243_ConfigUpdateMissedIfComponentIsRestartingTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5243_ConfigUpdateMissedIfComponentIsRestartingTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5243_ConfigUpdateMissedIfComponentIsRestartingTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5268_AddRemoveServiceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5268_AddRemoveServiceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5268_AddRemoveServiceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5268_AddRemoveServiceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5274_CleanupInstanceBoundDependenciesInDestroy.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5274_CleanupInstanceBoundDependenciesInDestroy.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5274_CleanupInstanceBoundDependenciesInDestroy.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5274_CleanupInstanceBoundDependenciesInDestroy.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5305_DirectInjectionShouldSeeServiceUpdates.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5305_DirectInjectionShouldSeeServiceUpdates.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5305_DirectInjectionShouldSeeServiceUpdates.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5305_DirectInjectionShouldSeeServiceUpdates.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5355_ConfigTypesWithDotsTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5355_ConfigTypesWithDotsTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5355_ConfigTypesWithDotsTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5355_ConfigTypesWithDotsTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5399_DefaultListConfigType.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5399_DefaultListConfigType.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5399_DefaultListConfigType.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5399_DefaultListConfigType.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5399_DefaultMapConfigType.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5399_DefaultMapConfigType.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5399_DefaultMapConfigType.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5399_DefaultMapConfigType.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5400_OverrideDefaultMapConfigTypeWithEmptyList.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5400_OverrideDefaultMapConfigTypeWithEmptyList.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5400_OverrideDefaultMapConfigTypeWithEmptyList.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5400_OverrideDefaultMapConfigTypeWithEmptyList.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5401_OverrideDefaultListConfigTypeWithEmptyMap.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5401_OverrideDefaultListConfigTypeWithEmptyMap.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5401_OverrideDefaultListConfigTypeWithEmptyMap.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5401_OverrideDefaultListConfigTypeWithEmptyMap.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5426_OptionalCallbackNotCalledTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5426_OptionalCallbackNotCalledTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5426_OptionalCallbackNotCalledTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5426_OptionalCallbackNotCalledTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5426_OptionalChangeCallbackNotCalledTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5426_OptionalChangeCallbackNotCalledTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5426_OptionalChangeCallbackNotCalledTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5426_OptionalChangeCallbackNotCalledTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5428_CleanupDependenciesWhenComponentIsStopped.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5428_CleanupDependenciesWhenComponentIsStopped.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5428_CleanupDependenciesWhenComponentIsStopped.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5428_CleanupDependenciesWhenComponentIsStopped.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5429_AspectSwapCallbackNotCalledForOptionalDepenency.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5429_AspectSwapCallbackNotCalledForOptionalDepenency.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5429_AspectSwapCallbackNotCalledForOptionalDepenency.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5429_AspectSwapCallbackNotCalledForOptionalDepenency.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5471_CyclicDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5471_CyclicDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5471_CyclicDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5471_CyclicDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5471_SynchronousUnbindTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5471_SynchronousUnbindTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5471_SynchronousUnbindTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5471_SynchronousUnbindTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5630_NullObjectTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5630_NullObjectTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5630_NullObjectTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5630_NullObjectTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5636_PropagateServicePropertiesToAspectInitCallback.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5636_PropagateServicePropertiesToAspectInitCallback.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5636_PropagateServicePropertiesToAspectInitCallback.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5636_PropagateServicePropertiesToAspectInitCallback.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5683_GetServicePropertiesReturnsNullTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5683_GetServicePropertiesReturnsNullTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX5683_GetServicePropertiesReturnsNullTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX5683_GetServicePropertiesReturnsNullTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX_4168AdapterWithDynamicallyAddedDependencies.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX_4168AdapterWithDynamicallyAddedDependencies.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FELIX_4168AdapterWithDynamicallyAddedDependencies.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FELIX_4168AdapterWithDynamicallyAddedDependencies.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryComponentWithMetaTypeTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FactoryComponentWithMetaTypeTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryComponentWithMetaTypeTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FactoryComponentWithMetaTypeTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationAdapterTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FactoryConfigurationAdapterTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationAdapterTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FactoryConfigurationAdapterTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationCreator.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FactoryConfigurationCreator.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryConfigurationCreator.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FactoryConfigurationCreator.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/InstanceBoundDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/InstanceBoundDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/InstanceBoundDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/InstanceBoundDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ModifiedBundleDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ModifiedBundleDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ModifiedBundleDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ModifiedBundleDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleExtraDependenciesTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/MultipleExtraDependenciesTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleExtraDependenciesTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/MultipleExtraDependenciesTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest2.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest2.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest2.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/MultipleExtraDependencyTest2.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/MultipleServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/MultipleServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/MultipleServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/OptionalConfigurationDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/RemovedDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/RemovedDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/RemovedDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/RemovedDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest2.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest2.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest2.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ResourceAdapterDependencyAddAndRemoveTest2.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ResourceAdapterTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceAdapterTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ResourceAdapterTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ResourceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ResourceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceProvider.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ResourceProvider.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ResourceProvider.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ResourceProvider.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ScopedAspectAdaptersServiceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ScopedAspectAdaptersServiceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ScopedAspectAdaptersServiceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ScopedAspectAdaptersServiceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ScopedServiceReferenceAndServiceObjectsTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ScopedServiceReferenceAndServiceObjectsTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ScopedServiceReferenceAndServiceObjectsTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ScopedServiceReferenceAndServiceObjectsTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ScopedServiceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ScopedServiceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ScopedServiceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ScopedServiceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ScopedServiceUnexpectedlyInstantiatedTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ScopedServiceUnexpectedlyInstantiatedTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ScopedServiceUnexpectedlyInstantiatedTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ScopedServiceUnexpectedlyInstantiatedTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyCallbackSignaturesTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceDependencyCallbackSignaturesTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyCallbackSignaturesTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceDependencyCallbackSignaturesTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyInjectionTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceDependencyInjectionTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyInjectionTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceDependencyInjectionTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyPropagateTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceDependencyPropagateTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyPropagateTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceDependencyPropagateTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyThroughCallbackInstanceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceDependencyThroughCallbackInstanceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceDependencyThroughCallbackInstanceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceDependencyThroughCallbackInstanceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceParallelTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceRaceParallelTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceParallelTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceRaceParallelTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceParallelWithOrderedUnbindTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceRaceParallelWithOrderedUnbindTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceParallelWithOrderedUnbindTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceRaceParallelWithOrderedUnbindTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceRaceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceWithOrderedUnbindTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceRaceWithOrderedUnbindTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceRaceWithOrderedUnbindTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceRaceWithOrderedUnbindTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceTrackerTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceTrackerTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceTrackerTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceTrackerTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceUpdateTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceUpdateTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/ServiceUpdateTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/ServiceUpdateTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/TemporalServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/TemporalServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/TemporalServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/TemporalServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetAspectServiceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/UngetAspectServiceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetAspectServiceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/UngetAspectServiceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetServiceTest.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/UngetServiceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/api/UngetServiceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/api/UngetServiceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/ConfigDeliveries.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/util/ConfigDeliveries.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/ConfigDeliveries.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/util/ConfigDeliveries.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/Ensure.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/util/Ensure.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/Ensure.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/util/Ensure.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/ServiceUtil.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/util/ServiceUtil.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/ServiceUtil.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/util/ServiceUtil.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/util/TestBase.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/TestBase.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/util/TestBase.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/packageinfo b/dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/util/packageinfo similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/util/packageinfo rename to dependencymanager/org.apache.felix.dependencymanager.itest.api/src/org/apache/felix/dm/itest/util/packageinfo diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest.api/test.bndrun b/dependencymanager/org.apache.felix.dependencymanager.itest.api/test.bndrun new file mode 100644 index 0000000000..bacc258edd --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.itest.api/test.bndrun @@ -0,0 +1,38 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +-runfw: org.apache.felix.framework;version='[8.0.0,9)' +-runee: JavaSE-11 +-runvm: -ea +-runsystempackages: sun.reflect +-runproperties: \ + org.apache.felix.dependencymanager.loglevel=2,\ + org.apache.felix.log.maxSize=100000,\ + org.apache.felix.log.storeDebug=true,\ + gosh.args=--noshutdown +-runrequires: \ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.itest.api)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.itest.bundle)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.itest.bundle2)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.shell)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.runtime)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.configadmin)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.log)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.metatype)',\ + osgi.identity;filter:='(osgi.identity=org.apache.servicemix.bundles.junit)' diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest.bundle/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle/pom.xml new file mode 100644 index 0000000000..2f3a30fb62 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle/pom.xml @@ -0,0 +1,78 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.itest.bundle + bundle + + Apache Felix Dependency Manager integration test bundle + Internal test bundle used by Apache Felix Dependency Manager integration tests + + + + true + true + + + + + org.osgi + osgi.core + 8.0.0 + + + org.osgi + osgi.cmpn + 7.0.0 + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + + + src + + + org.apache.felix + maven-bundle-plugin + + + Apache Felix Dependency Manager integration test bundle + test + org.apache.felix.dm.itest.bundle + + org.apache.felix.dm.itest.bundle.Activator + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/Activator.java b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/Activator.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/Activator.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/Activator.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/HelloWorld.java b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/HelloWorld.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/HelloWorld.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/HelloWorld.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/HelloWorldService.java b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/HelloWorldService.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/HelloWorldService.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/HelloWorldService.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/HelloWorldServiceFactory.java b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/HelloWorldServiceFactory.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/HelloWorldServiceFactory.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/HelloWorldServiceFactory.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestComponent.java b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/TestComponent.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestComponent.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/TestComponent.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestService.java b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/TestService.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle/TestService.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.bundle/src/org/apache/felix/dm/itest/bundle/TestService.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest.bundle2/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle2/pom.xml new file mode 100644 index 0000000000..970fced129 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle2/pom.xml @@ -0,0 +1,78 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.itest.bundle2 + bundle + + Apache Felix Dependency Manager integration test bundle 2 + Internal test bundle used by Apache Felix Dependency Manager integration tests + + + + true + true + + + + + org.osgi + osgi.core + 8.0.0 + + + org.osgi + osgi.cmpn + 7.0.0 + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + + + src + + + org.apache.felix + maven-bundle-plugin + + + Apache Felix Dependency Manager integration test bundle 2 + test + org.apache.felix.dm.itest.bundle2 + + org.apache.felix.dm.itest.bundle2.Activator + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle2/Activator.java b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle2/src/org/apache/felix/dm/itest/bundle2/Activator.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle2/Activator.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.bundle2/src/org/apache/felix/dm/itest/bundle2/Activator.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle2/AddRemoveService.java b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle2/src/org/apache/felix/dm/itest/bundle2/AddRemoveService.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle2/AddRemoveService.java rename to dependencymanager/org.apache.felix.dependencymanager.itest.bundle2/src/org/apache/felix/dm/itest/bundle2/AddRemoveService.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle2/packageinfo b/dependencymanager/org.apache.felix.dependencymanager.itest.bundle2/src/org/apache/felix/dm/itest/bundle2/packageinfo similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.itest/src/org/apache/felix/dm/itest/bundle2/packageinfo rename to dependencymanager/org.apache.felix.dependencymanager.itest.bundle2/src/org/apache/felix/dm/itest/bundle2/packageinfo diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/.classpath b/dependencymanager/org.apache.felix.dependencymanager.itest/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.itest/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/.project b/dependencymanager/org.apache.felix.dependencymanager.itest/.project deleted file mode 100644 index 9aaf1ea9c9..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager.itest - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/api.bnd b/dependencymanager/org.apache.felix.dependencymanager.itest/api.bnd deleted file mode 100644 index 6e0cfcaf23..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/api.bnd +++ /dev/null @@ -1,25 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dm.itest.api -Export-Package: \ - org.apache.felix.dm.itest.util -Bundle-Name: Apache Felix Dependency Manager integration tests -Bundle-Description: Integration tests for Apache Felix Dependency Manager -Bundle-Category: test -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Vendor: The Apache Software Foundation \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd deleted file mode 100644 index a3f4efab51..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/bnd.bnd +++ /dev/null @@ -1,55 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runbundles: \ - org.apache.servicemix.bundles.junit;version=4.13.2,\ - org.mockito.mockito-core;version='[5.24.0,5.25)',\ - net.bytebuddy.byte-buddy;version='[1.17.7,1.18)',\ - net.bytebuddy.byte-buddy-agent;version='[1.17.7,1.18)',\ - org.objenesis;version='[3.3.0,3.3.1)',\ - org.apache.felix.metatype;version=1.2.4,\ - org.apache.felix.log;version=1.3.2,\ - org.apache.felix.configadmin;version=latest,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.gogo.runtime;version=latest,\ - org.apache.felix.gogo.shell,\ - org.apache.felix.gogo.command --runee: JavaSE-11 --runvm: -ea --runfw: org.apache.felix.framework;version='[8.0.0,9)' --buildpath: \ - osgi.core;version=8.0,\ - osgi.cmpn;version=7.0,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - ${junit},\ - org.apache.felix.gogo.runtime;version=latest --runsystempackages: \ - sun.reflect --sub: \ - *.bnd -Test-Cases: \ - ${classes;CONCRETE;EXTENDS;junit.framework.TestCase} --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true,\ - gosh.args=--noshutdown - -# we do not release this project in binary distribution. --releaserepo: --baseline: diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/bundle.bnd b/dependencymanager/org.apache.felix.dependencymanager.itest/bundle.bnd deleted file mode 100644 index c2f69fa95a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/bundle.bnd +++ /dev/null @@ -1,25 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Export-Package: \ - org.apache.felix.dm.itest.bundle -Bundle-Activator: org.apache.felix.dm.itest.bundle.Activator -Bundle-Name: Apache Felix Dependency Manager integration test bundle -Bundle-Description: Internal test bundle used by Apache Felix Dependency Manager integration \ - tests -Bundle-Category: test -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Vendor: The Apache Software Foundation \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/bundle2.bnd b/dependencymanager/org.apache.felix.dependencymanager.itest/bundle2.bnd deleted file mode 100644 index 4fd90f4391..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.itest/bundle2.bnd +++ /dev/null @@ -1,19 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: org.apache.felix.dm.itest.bundle2 -Bundle-Activator: org.apache.felix.dm.itest.bundle2.Activator -Export-Package: org.apache.felix.dm.itest.bundle2 \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.itest/test/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.itest/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.lifecycle/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.lifecycle/pom.xml new file mode 100644 index 0000000000..371dc99ab3 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.lifecycle/pom.xml @@ -0,0 +1,138 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.lambda.itest.lifecycle + bundle + + Apache Felix Dependency Manager Lambda integration tests lifecycle bundle + Test bundle used by the Apache Felix Dependency Manager Lambda integration tests + + + + true + true + + + + + org.osgi + osgi.core + 8.0.0 + + + org.osgi + osgi.cmpn + 7.0.0 + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + org.apache.felix + org.apache.felix.dependencymanager.lambda + ${dependencymanager.lambda.version} + + + junit + junit + provided + + + + + src + + + maven-compiler-plugin + + + -parameters + + + + + + maven-resources-plugin + + + copy-ensure + generate-sources + + copy-resources + + + ${project.build.directory}/generated-sources/ensure + + + ../org.apache.felix.dependencymanager.lambda.itest.tests/src + + org/apache/felix/dm/lambda/itest/Ensure.java + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.0 + + + add-ensure + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/ensure + + + + + + + org.apache.felix + maven-bundle-plugin + + + test + org.apache.felix.dm.lambda.itest.lifecycle + + org.apache.felix.dm.lambda.itest.lifecycle.Activator + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/lifecycle/Activator.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.lifecycle/src/org/apache/felix/dm/lambda/itest/lifecycle/Activator.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/lifecycle/Activator.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.lifecycle/src/org/apache/felix/dm/lambda/itest/lifecycle/Activator.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/lifecycle/SimpleComponent.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.lifecycle/src/org/apache/felix/dm/lambda/itest/lifecycle/SimpleComponent.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/lifecycle/SimpleComponent.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.lifecycle/src/org/apache/felix/dm/lambda/itest/lifecycle/SimpleComponent.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/pom.xml new file mode 100644 index 0000000000..b3b743c2c2 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/pom.xml @@ -0,0 +1,152 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.lambda.itest.tests + bundle + + Apache Felix Dependency Manager Lambda integration tests + Integration tests for Apache Felix Dependency Manager Lambda + + + + true + true + + + + + org.osgi + osgi.core + 8.0.0 + + + org.osgi + osgi.cmpn + 7.0.0 + + + junit + junit + provided + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + org.apache.felix + org.apache.felix.dependencymanager.shell + ${dependencymanager.version} + + + org.apache.felix + org.apache.felix.dependencymanager.lambda + ${dependencymanager.lambda.version} + + + org.apache.felix + org.apache.felix.dependencymanager.lambda.itest.lifecycle + ${project.version} + + + org.apache.felix + org.apache.felix.configadmin + ${configadmin.version} + runtime + + + org.apache.felix + org.apache.felix.log + ${log.version} + runtime + + + org.apache.felix + org.apache.felix.metatype + ${metatype.version} + runtime + + + org.apache.felix + org.apache.felix.framework + ${framework.version} + runtime + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.junit + ${servicemix.junit.version} + runtime + + + org.apache.felix + org.apache.felix.gogo.runtime + ${gogo.runtime.version} + + + + + src + + + maven-compiler-plugin + + + -parameters + + + + + org.apache.felix + maven-bundle-plugin + + + test + org.apache.felix.dm.lambda.itest + + $[classes;CONCRETE;EXTENDS;junit.framework.TestCase] + + + + + biz.aQute.bnd + bnd-testing-maven-plugin + + + ${project.build.directory}/${project.build.finalName}.jar + + + test.bndrun + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AbstractServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AbstractServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AbstractServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AbstractServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterAndConsumerTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterAndConsumerTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterAndConsumerTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterAndConsumerTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterNoAutoConfigIfInstanceCallbackIsUsed.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithCallbackInstanceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithExtraDependenciesTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithExtraDependenciesTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithExtraDependenciesTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithExtraDependenciesTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyParallelTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyParallelTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyParallelTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyParallelTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithInstanceBoundDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithModifiedInstanceBoundDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithPropagationTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithPropagationTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithPropagationTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithPropagationTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AdapterWithoutPropagationTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectBaseTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectChainTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectChainTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectChainTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectChainTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectDynamicsTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectDynamicsTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectDynamicsTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectDynamicsTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectServiceDependencyWithSwapCallbackTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWhiteboardTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectWhiteboardTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWhiteboardTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectWhiteboardTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithCallbacksServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectWithCallbacksServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithCallbacksServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectWithCallbacksServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithPropagationTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectWithPropagationTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AspectWithPropagationTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AspectWithPropagationTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/AutoConfigTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/BundleAdapterTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/BundleAdapterTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/BundleAdapterWithCallbacksNotAutoConfiguredTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/BundleDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/BundleDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/BundleDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/CFDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/CFDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/CFDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/CFDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ComponentTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ComponentTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ComponentTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ComponentTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/CompositionTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/CompositionTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/CompositionTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/CompositionTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/DynamicProxyAspectTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/DynamicProxyAspectTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/DynamicProxyAspectTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/DynamicProxyAspectTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/DynamicScopedServiceTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/DynamicScopedServiceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/DynamicScopedServiceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/DynamicScopedServiceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/Ensure.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/Ensure.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/Ensure.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/Ensure.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FELIX5406_FluentPropertyWithDotTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/FELIX5406_FluentPropertyWithDotTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FELIX5406_FluentPropertyWithDotTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/FELIX5406_FluentPropertyWithDotTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FELIX5516Test.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/FELIX5516Test.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FELIX5516Test.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/FELIX5516Test.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationAdapterTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationAdapterTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationAdapterTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationAdapterTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationCreator.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationCreator.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationCreator.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/FactoryConfigurationCreator.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/FactoryInjectedWithConfigurationBeforeTheCreateMethod.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/Felix5244Test.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/Felix5244Test.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/Felix5244Test.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/Felix5244Test.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/InstanceBoundDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/InstanceBoundDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/InstanceBoundDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/InstanceBoundDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ModifiedBundleDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ModifiedBundleDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ModifiedBundleDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ModifiedBundleDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependenciesTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependenciesTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependenciesTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependenciesTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest2.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest2.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest2.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/MultipleExtraDependencyTest2.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/MultipleServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/MultipleServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/MultipleServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/OptionalConfigurationTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/OptionalConfigurationTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/OptionalConfigurationTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/OptionalConfigurationTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/RemovedDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/RemovedDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/RemovedDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/RemovedDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ResourceProvider.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ResourceProvider.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ResourceProvider.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ResourceProvider.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ScopedServiceReferenceAndServiceObjectsTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ScopedServiceReferenceAndServiceObjectsTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ScopedServiceReferenceAndServiceObjectsTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ScopedServiceReferenceAndServiceObjectsTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ScopedServiceTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ScopedServiceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ScopedServiceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ScopedServiceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyCallbackSignaturesTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceDependencyCallbackSignaturesTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyCallbackSignaturesTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceDependencyCallbackSignaturesTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyInjectionTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceDependencyInjectionTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyInjectionTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceDependencyInjectionTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyPropagateTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceDependencyPropagateTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyPropagateTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceDependencyPropagateTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyThroughCallbackInstanceTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceDependencyThroughCallbackInstanceTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceDependencyThroughCallbackInstanceTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceDependencyThroughCallbackInstanceTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceUpdateTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceUpdateTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceUpdateTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceUpdateTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceUtil.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceUtil.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/ServiceUtil.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/ServiceUtil.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/StopCallbackTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/StopCallbackTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/StopCallbackTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/StopCallbackTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TemporalServiceDependencyTest.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/TemporalServiceDependencyTest.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TemporalServiceDependencyTest.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/TemporalServiceDependencyTest.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/TestBase.java similarity index 100% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/src/org/apache/felix/dm/lambda/itest/TestBase.java rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/src/org/apache/felix/dm/lambda/itest/TestBase.java diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/test.bndrun similarity index 51% rename from dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd rename to dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/test.bndrun index c2b0020695..f59f947179 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/bnd.bnd +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest.tests/test.bndrun @@ -14,45 +14,25 @@ # See the License for the specific language governing permissions and # limitations under the License. # --buildpath: \ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.lambda;version=latest,\ - ${junit},\ - osgi.core;version=8.0,\ - osgi.cmpn;version=7.0 --runbundles: \ - org.apache.servicemix.bundles.junit;version=4.13.2,\ - org.mockito.mockito-core;version='[5.24.0,5.25)',\ - net.bytebuddy.byte-buddy;version='[1.17.7,1.18)',\ - net.bytebuddy.byte-buddy-agent;version='[1.17.7,1.18)',\ - org.objenesis;version='[3.3.0,3.3.1)',\ - org.apache.felix.metatype;version=1.2.4,\ - org.apache.felix.log;version=1.3.2,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.configadmin;version=latest,\ - org.apache.felix.dependencymanager.lambda;version=latest,\ - org.apache.felix.gogo.runtime;version=latest - --runee: JavaSE-11 -runfw: org.apache.felix.framework;version='[8.0.0,9)' +-runee: JavaSE-11 -runvm: -ea -Bundle-Version: 0.0.0.${tstamp} -Test-Cases: ${classes;CONCRETE;EXTENDS;junit.framework.TestCase} -javac.source: 11 -javac.target: 11 - +-runsystempackages: sun.reflect # all tests are configured to assume that dependencies are required by default --runproperties: \ +-runproperties: \ org.apache.felix.dependencymanager.loglevel=2,\ org.apache.felix.dependencymanager.lambda.defaultRequiredDependency=org.apache.felix.dm.lambda.itest,\ org.apache.felix.log.maxSize=100000,\ org.apache.felix.log.storeDebug=true,\ gosh.args=--noshutdown - -# we do not release this project in binary distribution. --releaserepo: --baseline: - --sub: *.bnd \ No newline at end of file +-runrequires: \ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.lambda.itest.tests)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.lambda.itest.lifecycle)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.shell)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.lambda)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.runtime)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.configadmin)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.log)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.metatype)',\ + osgi.identity;filter:='(osgi.identity=org.apache.servicemix.bundles.junit)' diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.classpath b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.gitignore deleted file mode 100644 index 5e92567988..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/generated/ -/bin_test/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.project b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.project deleted file mode 100644 index c302837df3..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager.lambda.itest - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.settings/org.eclipse.jdt.core.prefs b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 144c60c0ff..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/build.gradle b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/build.gradle deleted file mode 100644 index e6d9792ce9..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/build.gradle +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -tasks.withType(JavaCompile) { - options.compilerArgs << "-parameters" << "-Xdiags:verbose" -} diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/lifecycle.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/lifecycle.bnd deleted file mode 100644 index 9347ea60e1..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/lifecycle.bnd +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Export-Package: org.apache.felix.dm.lambda.itest.lifecycle -Bundle-Activator: org.apache.felix.dm.lambda.itest.lifecycle.Activator \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/test/.keepme b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/test/.keepme deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/tests.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/tests.bnd deleted file mode 100644 index f27837d086..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.itest/tests.bnd +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Export-Package: \ - org.apache.felix.dm.lambda.itest diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.classpath b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.project b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.project deleted file mode 100644 index 919fddb58c..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager.runtime.itest - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd deleted file mode 100644 index cfc781e5f8..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/bnd.bnd +++ /dev/null @@ -1,66 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --buildpath: \ - ${junit},\ - org.apache.felix.dependencymanager.annotation;version=latest,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.itest.api;version=latest,\ - osgi.core;version=8.0,\ - osgi.cmpn;version=7.0 --runbundles: \ - org.apache.servicemix.bundles.junit;version=4.13.2,\ - org.mockito.mockito-core;version='[5.24.0,5.25)',\ - net.bytebuddy.byte-buddy;version='[1.17.7,1.18)',\ - net.bytebuddy.byte-buddy-agent;version='[1.17.7,1.18)',\ - org.objenesis;version='[3.3.0,3.3.1)',\ - org.apache.felix.metatype;version=1.2.4,\ - org.apache.servicemix.bundles.junit;version=4.13.2,\ - org.apache.felix.configadmin;version=latest,\ - org.apache.felix.gogo.runtime;version=latest,\ - org.apache.felix.log;version=1.3.2,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest --runee: JavaSE-11 --runfw: org.apache.felix.framework;version='[8.0.0,9)' --runsystempackages: \ - sun.reflect --runvm:-ea -Private-Package: \ - org.apache.felix.dm.runtime.itest.tests,\ - org.apache.felix.dm.runtime.itest.components,\ - org.apache.felix.dm.itest.util --plugin: org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug;\ - path:=${workspace}/org.apache.felix.dependencymanager.annotation/generated/org.apache.felix.dependencymanager.annotation.jar --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true,\ - gosh.args=--noshutdown -Test-Cases: \ - ${classes;CONCRETE;EXTENDS;junit.framework.TestCase} -Bundle-Name: Apache Felix Dependency Manager Runtime integration tests -Bundle-Description: Integration tests for Apache Felix Dependency Manager Runtime -Bundle-Category: test -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Vendor: The Apache Software Foundation - - -# we do not release this project in binary distribution. --releaserepo: --baseline: diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/pom.xml new file mode 100644 index 0000000000..1b2129bc44 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/pom.xml @@ -0,0 +1,155 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.runtime.itest + bundle + + Apache Felix Dependency Manager Runtime integration tests + Integration tests for Apache Felix Dependency Manager Runtime + + + + true + true + + + + + org.osgi + osgi.core + 8.0.0 + + + org.osgi + osgi.cmpn + 7.0.0 + + + junit + junit + provided + + + org.apache.felix + org.apache.felix.dependencymanager.annotation + ${dependencymanager.annotation.version} + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + org.apache.felix + org.apache.felix.dependencymanager.runtime + ${dependencymanager.runtime.version} + + + org.apache.felix + org.apache.felix.dependencymanager.itest.api + ${project.version} + + + org.apache.felix + org.apache.felix.dependencymanager.shell + ${dependencymanager.version} + + + org.apache.felix + org.apache.felix.gogo.runtime + ${gogo.runtime.version} + + + org.apache.felix + org.apache.felix.configadmin + ${configadmin.version} + runtime + + + org.apache.felix + org.apache.felix.log + ${log.version} + runtime + + + org.apache.felix + org.apache.felix.metatype + ${metatype.version} + runtime + + + org.apache.felix + org.apache.felix.framework + ${framework.version} + runtime + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.junit + ${servicemix.junit.version} + runtime + + + + + src + + + org.apache.felix + maven-bundle-plugin + + + test + + org.apache.felix.dm.runtime.itest.tests, + org.apache.felix.dm.runtime.itest.components, + org.apache.felix.dm.itest.util + + + + <_plugin>org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug;path:=${project.basedir}/../org.apache.felix.dependencymanager.annotation/target/org.apache.felix.dependencymanager.annotation-${dependencymanager.annotation.version}.jar + $[classes;CONCRETE;EXTENDS;junit.framework.TestCase] + + + + + biz.aQute.bnd + bnd-testing-maven-plugin + + + ${project.build.directory}/${project.build.finalName}.jar + + + test.bndrun + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/test.bndrun b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/test.bndrun new file mode 100644 index 0000000000..5192b4a1e4 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/test.bndrun @@ -0,0 +1,35 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +-runfw: org.apache.felix.framework;version='[8.0.0,9)' +-runee: JavaSE-11 +-runvm: -ea +-runsystempackages: sun.reflect +-runproperties: \ + org.apache.felix.dependencymanager.loglevel=2,\ + org.apache.felix.log.maxSize=100000,\ + org.apache.felix.log.storeDebug=true,\ + gosh.args=--noshutdown +-runrequires: \ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.runtime.itest)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.runtime)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.dependencymanager.shell)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.runtime)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.configadmin)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.log)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.metatype)',\ + osgi.identity;filter:='(osgi.identity=org.apache.servicemix.bundles.junit)' diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/test/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.runtime.itest/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/pom.xml b/dependencymanager/pom.xml index db1d967f05..52b52b5c13 100644 --- a/dependencymanager/pom.xml +++ b/dependencymanager/pom.xml @@ -48,6 +48,15 @@ org.apache.felix.dependencymanager.runtime org.apache.felix.dependencymanager.shell org.apache.felix.dependencymanager.lambda + org.apache.felix.dependencymanager.itest.bundle + org.apache.felix.dependencymanager.itest.bundle2 + org.apache.felix.dependencymanager.itest.api + org.apache.felix.dependencymanager.index.itest.dynamic.customindex + org.apache.felix.dependencymanager.index.itest.static.customindex + org.apache.felix.dependencymanager.index.itest.tests + org.apache.felix.dependencymanager.lambda.itest.lifecycle + org.apache.felix.dependencymanager.lambda.itest.tests + org.apache.felix.dependencymanager.runtime.itest @@ -61,7 +70,17 @@ 5.24.0 7.4.0 5.0.0-SNAPSHOT - 1.2.0-SNAPSHOT + 2.0.0-SNAPSHOT + 6.0.0-SNAPSHOT + 5.0.0-SNAPSHOT + 1.2.0 + 1.1.4 + 1.1.2 + 1.10.0 + 8.0.0 + 1.3.2 + 1.2.4 + 4.13.2_1 @@ -136,6 +155,34 @@ + + biz.aQute.bnd + bnd-maven-plugin + ${bnd.version} + + + + bnd-process + + + + + + biz.aQute.bnd + bnd-testing-maven-plugin + ${bnd.version} + + true + false + + + + + testing + + + + From f8ab3cb60b9d1f84b06d8aaf1a4d1b59a7544d20 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 24 Oct 2026 20:17:37 +0000 Subject: [PATCH 11/12] FELIX-6872 - Dependency Manager: build the samples and the benchmark with Maven Convert the samples, the lambda samples and the benchmark to Maven modules. Each of their bundles is built by its own execution of the maven-bundle-plugin from the packages it contained before, with the same headers, so the bundles are the same as the ones of the bnd build, and the annotation descriptors are generated for the annotated samples only. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- .../.classpath | 12 - .../.gitignore | 3 - .../.project | 23 - .../bnd.bnd | 32 -- .../controller.bnd | 21 - .../dependencymanager.bnd | 19 - .../dependencymanager.parallel.bnd | 19 - .../index.bndrun | 37 -- .../noindex.bndrun | 37 -- .../pom.xml | 163 +++++++ .../scenario.bnd | 19 - .../src/.gitignore | 0 .../test/.gitignore | 0 .../.classpath | 12 - .../.gitignore | 3 - .../.project | 23 - .../.settings/org.eclipse.jdt.core.prefs | 12 - .../bnd.bnd | 18 - .../build.gradle | 22 - .../compositefactory.bnd | 18 - .../compositefactory.bndrun | 36 -- .../device.bnd | 18 - .../device.bndrun | 36 -- .../dictionary.bnd | 18 - .../dictionary.bndrun | 38 -- .../factory.bnd | 18 - .../factory.bndrun | 37 -- .../future.bnd | 18 - .../future.bndrun | 37 -- .../hello.bnd | 18 - .../hello.bndrun | 37 -- .../pom.xml | 227 ++++++++++ .../src/.gitignore | 0 .../test/.gitignore | 0 .../.classpath | 12 - .../.gitignore | 3 - .../.project | 23 - .../bnd.bnd | 38 -- .../composite.bnd | 21 - .../composite.bndrun | 40 -- .../compositefactory.bnd | 21 - .../compositefactory.bndrun | 40 -- .../conf.bnd | 21 - .../customdep.bnd | 21 - .../customdep.bndrun | 39 -- .../device.annot.bnd | 20 - .../device.annot.bndrun | 40 -- .../device.api.bnd | 21 - .../device.api.bndrun | 39 -- .../dictionary.annot.bnd | 20 - .../dictionary.annot.bndrun | 43 -- .../dictionary.api.bnd | 21 - .../dictionary.api.bndrun | 43 -- .../dictionary.metatype.bnd | 21 - .../dictionary.metatype.bndrun | 43 -- .../dynamicdep.annot.bnd | 20 - .../dynamicdep.annot.bndrun | 41 -- .../dynamicdep.api.bnd | 21 - .../dynamicdep.api.bndrun | 42 -- .../hello.annot.bnd | 20 - .../hello.annot.bndrun | 41 -- .../hello.api.bnd | 20 - .../hello.api.bndrun | 41 -- .../pom.xml | 424 ++++++++++++++++++ .../src/.gitignore | 0 .../test/.gitignore | 0 .../tpool.bnd | 22 - .../tpool.bndrun | 41 -- dependencymanager/pom.xml | 3 + 69 files changed, 817 insertions(+), 1540 deletions(-) delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/controller.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/dependencymanager.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/dependencymanager.parallel.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/index.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/noindex.bndrun create mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/pom.xml delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/scenario.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/src/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.benchmark/test/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.settings/org.eclipse.jdt.core.prefs delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/build.gradle delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun create mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/pom.xml delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda.samples/test/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/composite.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/conf.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.metatype.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.metatype.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun create mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/pom.xml delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/src/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/test/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bndrun diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/.classpath b/dependencymanager/org.apache.felix.dependencymanager.benchmark/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.benchmark/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/.project b/dependencymanager/org.apache.felix.dependencymanager.benchmark/.project deleted file mode 100644 index e601a910ba..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager.benchmark - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd deleted file mode 100644 index 4b0f4eb236..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/bnd.bnd +++ /dev/null @@ -1,32 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -javac.source: 11 -javac.target: 11 -Bundle-Version: 1.0.0 --buildpath: \ - org.apache.felix.dependencymanager;version=latest,\ - osgi.core;version=8.0,\ - osgi.cmpn;version=7.0 - --sub: \ - *.bnd -Export-Package: \ - org.apache.felix.dm.benchmark.scenario.impl - -# we do not release this project in binary distribution. --releaserepo: --baseline: diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/controller.bnd b/dependencymanager/org.apache.felix.dependencymanager.benchmark/controller.bnd deleted file mode 100644 index d4fcced6d8..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/controller.bnd +++ /dev/null @@ -1,21 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dm.benchmark.controller.impl -Bundle-Activator: org.apache.felix.dm.benchmark.controller.impl.Activator -Export-Package: \ - org.apache.felix.dm.benchmark.controller \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/dependencymanager.bnd b/dependencymanager/org.apache.felix.dependencymanager.benchmark/dependencymanager.bnd deleted file mode 100644 index 8e12db1173..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/dependencymanager.bnd +++ /dev/null @@ -1,19 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dm.benchmark.dependencymanager -Bundle-Activator: org.apache.felix.dm.benchmark.dependencymanager.Activator \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/dependencymanager.parallel.bnd b/dependencymanager/org.apache.felix.dependencymanager.benchmark/dependencymanager.parallel.bnd deleted file mode 100644 index b6ce3b27bc..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/dependencymanager.parallel.bnd +++ /dev/null @@ -1,19 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Bundle-Activator: org.apache.felix.dm.benchmark.dependencymanager.ParallelActivator -Private-Package: \ - org.apache.felix.dm.benchmark.dependencymanager \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/index.bndrun b/dependencymanager/org.apache.felix.dependencymanager.benchmark/index.bndrun deleted file mode 100644 index fb581164f4..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/index.bndrun +++ /dev/null @@ -1,37 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runbundles: \ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.metatype;version=1.0.10,\ - org.apache.felix.log;version=1.0.1,\ - ${gogo},\ - org.apache.felix.configadmin;version=1.8.8,\ - org.apache.felix.dependencymanager.benchmark.scenario;version=latest,\ - org.apache.felix.dependencymanager.benchmark.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.benchmark.dependencymanager.parallel;version=latest,\ - org.apache.felix.dependencymanager.benchmark.controller;version=latest - --runfw: ${felix.framework} - --runproperties: \ - ds.loglevel=warn,\ - org.osgi.framework.bootdelegation='sun.*,com.sun.*,org.netbeans.*',\ - org.apache.felix.dependencymanager.filterindex='objectClass,id' --runvm: -server -Xmx1024m -Xms1024m -javac.source: 1.8 -javac.target: 1.8 diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/noindex.bndrun b/dependencymanager/org.apache.felix.dependencymanager.benchmark/noindex.bndrun deleted file mode 100644 index b4a1eb0c15..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/noindex.bndrun +++ /dev/null @@ -1,37 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runbundles: \ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.metatype;version=1.0.10,\ - org.apache.felix.log;version=1.0.1,\ - ${gogo},\ - org.apache.felix.configadmin;version=1.8.8,\ - org.apache.felix.dependencymanager.benchmark.scenario;version=latest,\ - org.apache.felix.dependencymanager.benchmark.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.benchmark.dependencymanager.parallel;version=latest,\ - org.apache.felix.dependencymanager.benchmark.controller;version=latest - --runfw: ${felix.framework} - --runproperties: \ - ds.loglevel=warn,\ - org.osgi.framework.bootdelegation='sun.*,com.sun.*,org.netbeans.*' --runvm: -server -Xmx1024m -Xms1024m --runee: JavaSE-1.8 -javac.source: 1.8 -javac.target: 1.8 diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.benchmark/pom.xml new file mode 100644 index 0000000000..3611a81394 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.benchmark/pom.xml @@ -0,0 +1,163 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.benchmark + 1.0.0-SNAPSHOT + jar + + Apache Felix Dependency Manager Benchmark + Benchmark of Apache Felix Dependency Manager + + + + true + true + true + + + + + org.osgi + osgi.core + + + org.osgi + osgi.cmpn + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + + + src + + + + org.apache.geronimo.genesis.plugins + tools-maven-plugin + + + verify-legal-files + none + + + + + + maven-jar-plugin + + + default-jar + none + + + + + org.apache.felix + maven-bundle-plugin + + + + + + + controller + package + + bundle + + + controller + + org.apache.felix.dependencymanager.benchmark.controller + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dm/benchmark/controller=${project.build.outputDirectory}/org/apache/felix/dm/benchmark/controller,org/apache/felix/dm/benchmark/controller/impl=${project.build.outputDirectory}/org/apache/felix/dm/benchmark/controller/impl + + org.apache.felix.dm.benchmark.controller + org.apache.felix.dm.benchmark.controller.impl.Activator + + + + + dependencymanager + package + + bundle + + + dependencymanager + + org.apache.felix.dependencymanager.benchmark.dependencymanager + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dm/benchmark/dependencymanager=${project.build.outputDirectory}/org/apache/felix/dm/benchmark/dependencymanager,org/apache/felix/dm/benchmark/scenario/impl=${project.build.outputDirectory}/org/apache/felix/dm/benchmark/scenario/impl + + org.apache.felix.dm.benchmark.scenario.impl + org.apache.felix.dm.benchmark.dependencymanager.Activator + + + + + dependencymanager.parallel + package + + bundle + + + dependencymanager.parallel + + org.apache.felix.dependencymanager.benchmark.dependencymanager.parallel + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dm/benchmark/dependencymanager=${project.build.outputDirectory}/org/apache/felix/dm/benchmark/dependencymanager,org/apache/felix/dm/benchmark/scenario/impl=${project.build.outputDirectory}/org/apache/felix/dm/benchmark/scenario/impl + + org.apache.felix.dm.benchmark.scenario.impl + org.apache.felix.dm.benchmark.dependencymanager.ParallelActivator + + + + + scenario + package + + bundle + + + scenario + + org.apache.felix.dependencymanager.benchmark.scenario + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dm/benchmark/scenario=${project.build.outputDirectory}/org/apache/felix/dm/benchmark/scenario,org/apache/felix/dm/benchmark/scenario/impl=${project.build.outputDirectory}/org/apache/felix/dm/benchmark/scenario/impl + + org.apache.felix.dm.benchmark.scenario.impl,org.apache.felix.dm.benchmark.scenario + + + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/scenario.bnd b/dependencymanager/org.apache.felix.dependencymanager.benchmark/scenario.bnd deleted file mode 100644 index 8ede3fc6f7..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.benchmark/scenario.bnd +++ /dev/null @@ -1,19 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Export-Package: \ - org.apache.felix.dm.benchmark.scenario.impl,\ - org.apache.felix.dm.benchmark.scenario \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/src/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.benchmark/src/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.benchmark/test/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.benchmark/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.classpath b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.project b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.project deleted file mode 100644 index 4e58a1cbb6..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager.lambda.samples - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.settings/org.eclipse.jdt.core.prefs b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 144c60c0ff..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd deleted file mode 100644 index 559acfb89e..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/bnd.bnd +++ /dev/null @@ -1,18 +0,0 @@ --buildpath: \ - org.apache.felix.dependencymanager.lambda;version=latest,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.gogo.runtime;version=latest,\ - osgi.core;version=8.0,\ - osgi.cmpn;version=7.0,\ - biz.aQute.bnd.annotation - -Bundle-Version: 0.0.0.${tstamp} --sub: *.bnd --metatype: * -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-DocURL: http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html -Bundle-Vendor: The Apache Software Foundation - -# we do not release this project in binary distribution. --releaserepo: --baseline: diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/build.gradle b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/build.gradle deleted file mode 100644 index 024d8b6ff0..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/build.gradle +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -tasks.withType(JavaCompile) { - options.compilerArgs << "-parameters" -} diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bnd deleted file mode 100644 index 2b7dcdd0aa..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bnd +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: org.apache.felix.dm.lambda.samples.compositefactory -Bundle-Activator: org.apache.felix.dm.lambda.samples.compositefactory.Activator diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun deleted file mode 100644 index c7c5169881..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/compositefactory.bndrun +++ /dev/null @@ -1,36 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${gogo},\ - ${log},\ - ${configadmin},\ - ${metatype},\ - org.apache.felix.dependencymanager.lambda.samples.compositefactory;version=latest,\ - org.apache.felix.dependencymanager;version=4.2.0,\ - org.apache.felix.dependencymanager.shell;version=4.0.3,\ - org.apache.felix.dependencymanager.lambda;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bnd deleted file mode 100644 index 0cf4b65eb1..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bnd +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: org.apache.felix.dm.lambda.samples.device -Bundle-Activator: org.apache.felix.dm.lambda.samples.device.Activator diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun deleted file mode 100644 index 9896791edf..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/device.bndrun +++ /dev/null @@ -1,36 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${gogo},\ - ${log},\ - ${configadmin},\ - ${metatype},\ - org.apache.felix.dependencymanager.lambda.samples.device;version=latest,\ - org.apache.felix.dependencymanager;version=4.2.0,\ - org.apache.felix.dependencymanager.shell;version=4.0.3,\ - org.apache.felix.dependencymanager.lambda;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bnd deleted file mode 100644 index 41e8c6de05..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bnd +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: org.apache.felix.dm.lambda.samples.dictionary -Bundle-Activator: org.apache.felix.dm.lambda.samples.dictionary.Activator diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun deleted file mode 100644 index 7533e6fe67..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/dictionary.bndrun +++ /dev/null @@ -1,38 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - ${webconsole},\ - org.apache.felix.dependencymanager.lambda.samples.dictionary;version=latest,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.lambda;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bnd deleted file mode 100644 index 6de3b6229b..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bnd +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: org.apache.felix.dm.lambda.samples.factory -Bundle-Activator: org.apache.felix.dm.lambda.samples.factory.Activator diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun deleted file mode 100644 index c5f88dec8e..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/factory.bndrun +++ /dev/null @@ -1,37 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - org.apache.felix.dependencymanager.lambda.samples.factory;version=latest,\ - org.apache.felix.dependencymanager;version=4.2.0,\ - org.apache.felix.dependencymanager.shell;version=4.0.3,\ - org.apache.felix.dependencymanager.lambda;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bnd deleted file mode 100644 index 0eb1e71c89..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bnd +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: org.apache.felix.dm.lambda.samples.future -Bundle-Activator: org.apache.felix.dm.lambda.samples.future.Activator diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun deleted file mode 100644 index 88209a282a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/future.bndrun +++ /dev/null @@ -1,37 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${eventadmin},\ - ${configadmin},\ - org.apache.felix.dependencymanager.lambda.samples.future;version=latest,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.lambda;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bnd deleted file mode 100644 index 3a7b482f3e..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bnd +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: org.apache.felix.dm.lambda.samples.hello -Bundle-Activator: org.apache.felix.dm.lambda.samples.hello.Activator diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun deleted file mode 100644 index c74805fa1c..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/hello.bndrun +++ /dev/null @@ -1,37 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${eventadmin},\ - ${configadmin},\ - org.apache.felix.dependencymanager.lambda.samples.hello;version=latest,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.lambda;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/pom.xml new file mode 100644 index 0000000000..92cf7c0588 --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/pom.xml @@ -0,0 +1,227 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.lambda.samples + 1.0.0-SNAPSHOT + jar + + Apache Felix Dependency Manager Lambda Samples + Samples of the Apache Felix Dependency Manager lambda API + + + + true + true + true + + + + + org.osgi + osgi.core + + + org.osgi + osgi.cmpn + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + org.apache.felix + org.apache.felix.dependencymanager.lambda + ${dependencymanager.lambda.version} + + + org.apache.felix + org.apache.felix.gogo.runtime + ${gogo.runtime.version} + provided + + + + + src + + + + org.apache.geronimo.genesis.plugins + tools-maven-plugin + + + verify-legal-files + none + + + + + + maven-jar-plugin + + + default-jar + none + + + + + org.apache.felix + maven-bundle-plugin + + + + + + + compositefactory + package + + bundle + + + compositefactory + + org.apache.felix.dependencymanager.lambda.samples.compositefactory + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dm/lambda/samples/compositefactory=${project.build.outputDirectory}/org/apache/felix/dm/lambda/samples/compositefactory + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dm.lambda.samples.compositefactory.Activator + + + + + device + package + + bundle + + + device + + org.apache.felix.dependencymanager.lambda.samples.device + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dm/lambda/samples/device=${project.build.outputDirectory}/org/apache/felix/dm/lambda/samples/device + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dm.lambda.samples.device.Activator + + + + + dictionary + package + + bundle + + + dictionary + + org.apache.felix.dependencymanager.lambda.samples.dictionary + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dm/lambda/samples/dictionary=${project.build.outputDirectory}/org/apache/felix/dm/lambda/samples/dictionary + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dm.lambda.samples.dictionary.Activator + + + + + factory + package + + bundle + + + factory + + org.apache.felix.dependencymanager.lambda.samples.factory + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dm/lambda/samples/factory=${project.build.outputDirectory}/org/apache/felix/dm/lambda/samples/factory + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dm.lambda.samples.factory.Activator + + + + + future + package + + bundle + + + future + + org.apache.felix.dependencymanager.lambda.samples.future + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dm/lambda/samples/future=${project.build.outputDirectory}/org/apache/felix/dm/lambda/samples/future + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dm.lambda.samples.future.Activator + + + + + hello + package + + bundle + + + hello + + org.apache.felix.dependencymanager.lambda.samples.hello + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dm/lambda/samples/hello=${project.build.outputDirectory}/org/apache/felix/dm/lambda/samples/hello + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dm.lambda.samples.hello.Activator + + + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/src/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/test/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.lambda.samples/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/.classpath b/dependencymanager/org.apache.felix.dependencymanager.samples/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.samples/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/.project b/dependencymanager/org.apache.felix.dependencymanager.samples/.project deleted file mode 100644 index cd3ff99cd2..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager.samples - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd deleted file mode 100644 index 1b2d1769f3..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd +++ /dev/null @@ -1,38 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Bundle-Version: 1.0.0.${tstamp} --buildpath: \ - biz.aQute.bnd.annotation,\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.gogo.runtime;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.annotation;version=latest,\ - osgi.core;version=8.0,\ - osgi.cmpn;version=7.0 --sub: \ - *.bnd --metatype: * -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-DocURL: http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html -Bundle-Vendor: The Apache Software Foundation - --plugin: org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug;\ - path:=${workspace}/org.apache.felix.dependencymanager.annotation/generated/org.apache.felix.dependencymanager.annotation.jar - -# we do not release this project in binary distribution. --releaserepo: --baseline: diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bnd deleted file mode 100644 index d0a46f76d9..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bnd +++ /dev/null @@ -1,21 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.composite -Bundle-Activator: org.apache.felix.dependencymanager.samples.composite.Activator -Bundle-Description: Dependency Manager composite example -Bundle-Name: Dependency Manager Composite Example \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun deleted file mode 100644 index e4b9dd7aa4..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bndrun +++ /dev/null @@ -1,40 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.samples.conf;version=latest,\ - org.apache.felix.dependencymanager.samples.composite;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bnd deleted file mode 100644 index dfa7baa3a8..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bnd +++ /dev/null @@ -1,21 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.compositefactory -Bundle-Activator: org.apache.felix.dependencymanager.samples.compositefactory.Activator -Bundle-Description: Dependency Manager composite factory example -Bundle-Name: Dependency Manager Composite Factory Example \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun deleted file mode 100644 index 39d66d6bb0..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bndrun +++ /dev/null @@ -1,40 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.samples.conf;version=latest,\ - org.apache.felix.dependencymanager.samples.compositefactory;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/conf.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/conf.bnd deleted file mode 100644 index 6752249f76..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/conf.bnd +++ /dev/null @@ -1,21 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.conf -Bundle-Activator: org.apache.felix.dependencymanager.samples.conf.Activator -Bundle-Description: Dependency Manager examples configurations -Bundle-Name: Dependency Manager Examples Configurations \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bnd deleted file mode 100644 index ad294bd9f4..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bnd +++ /dev/null @@ -1,21 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.customdep -Bundle-Activator: org.apache.felix.dependencymanager.samples.customdep.Activator -Bundle-Description: Dependency Manager custom dependencies example -Bundle-Name: Dependency Manager Custom Dependencies Example \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun deleted file mode 100644 index 1987cd1060..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bndrun +++ /dev/null @@ -1,39 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.samples.customdep;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd deleted file mode 100644 index 0d46a88ab4..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd +++ /dev/null @@ -1,20 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.device.annot -Bundle-Description: Dependency Manager device example with annotations -Bundle-Name: Dependency Manager Device Example With Annotations diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun deleted file mode 100644 index 9cf140c36a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bndrun +++ /dev/null @@ -1,40 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.samples.device.annot;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.runtime.log=false,\ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bnd deleted file mode 100644 index 433d1ed119..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bnd +++ /dev/null @@ -1,21 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.device.api -Bundle-Activator: org.apache.felix.dependencymanager.samples.device.api.Activator -Bundle-Description: Dependency Manager device example with api -Bundle-Name: Dependency Manager Device Example \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun deleted file mode 100644 index ad224a2400..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bndrun +++ /dev/null @@ -1,39 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.samples.device.api;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd deleted file mode 100644 index d7fcb9190d..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd +++ /dev/null @@ -1,20 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.dictionary.annot -Bundle-Description: Dependency Manager dictionary example with annotations -Bundle-Name: Dependency Manager Dictionary Example With Annotations diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun deleted file mode 100644 index 03bd8c8aa7..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bndrun +++ /dev/null @@ -1,43 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - ${webconsole},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.samples.dictionary.annot;version=latest,\ - slf4j.simple;version=1.7.7,\ - slf4j.api;version=1.7.7 - --runproperties: \ - org.apache.felix.dependencymanager.runtime.log=false,\ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bnd deleted file mode 100644 index 77a87be242..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bnd +++ /dev/null @@ -1,21 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.dictionary.api -Bundle-Activator: org.apache.felix.dependencymanager.samples.dictionary.api.Activator -Bundle-Description: Dependency Manager dictionary example with api -Bundle-Name: Dependency Manager Dictionary Example \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun deleted file mode 100644 index 47dcddd919..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bndrun +++ /dev/null @@ -1,43 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - ${webconsole},\ - ${bndlib},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.samples.dictionary.api;version=latest,\ - slf4j.simple;version=1.7.7,\ - slf4j.api;version=1.7.7 - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.metatype.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.metatype.bnd deleted file mode 100644 index aba4bf7d13..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.metatype.bnd +++ /dev/null @@ -1,21 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.dictionary.metatype -Bundle-Activator: org.apache.felix.dependencymanager.samples.dictionary.metatype.Activator -Bundle-Description: Dependency Manager dictionary example with api and metatype -Bundle-Name: Dependency Manager Dictionary Example \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.metatype.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.metatype.bndrun deleted file mode 100644 index cd71d4e207..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.metatype.bndrun +++ /dev/null @@ -1,43 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - ${webconsole},\ - ${bndlib},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.samples.dictionary.metatype;version=latest,\ - slf4j.simple;version=1.7.7,\ - slf4j.api;version=1.7.7 - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd deleted file mode 100644 index b54e15d13c..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd +++ /dev/null @@ -1,20 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.dynamicdep.annot -Bundle-Description: Dependency Manager dynamic dependency example with annotations -Bundle-Name: Dependency Manager Dynamic Dependency Example With Annotations diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun deleted file mode 100644 index aa59eb02b6..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bndrun +++ /dev/null @@ -1,41 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - ${webconsole},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.samples.dynamicdep.annot;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.runtime.log=false,\ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bnd deleted file mode 100644 index c5071c03b1..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bnd +++ /dev/null @@ -1,21 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Bundle-Activator: org.apache.felix.dependencymanager.samples.dynamicdep.api.Activator -Private-Package: \ - org.apache.felix.dependencymanager.samples.dynamicdep.api -Bundle-Description: Dependency Manager dynamic dependency example with api -Bundle-Name: Dependency Manager Dynamic Dependency Example \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun deleted file mode 100644 index 1d612421b4..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bndrun +++ /dev/null @@ -1,42 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - ${webconsole},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.samples.dynamicdep.api;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.runtime.log=warn,\ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd deleted file mode 100644 index aff5a381c9..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd +++ /dev/null @@ -1,20 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.hello.annot -Bundle-Description: Dependency Manager hello example with annotations -Bundle-Name: Dependency Manager Hello Example With Annotations diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun deleted file mode 100644 index dd4824e0d3..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bndrun +++ /dev/null @@ -1,41 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.samples.conf;version=latest,\ - org.apache.felix.dependencymanager.samples.hello.annot;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.runtime.log=false,\ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bnd deleted file mode 100644 index 7c5262fd1c..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bnd +++ /dev/null @@ -1,20 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Bundle-Activator: org.apache.felix.dependencymanager.samples.hello.api.Activator -Bundle-Description: Dependency Manager hello example with API -Bundle-Name: Dependency Manager Hello Example -Private-Package: org.apache.felix.dependencymanager.samples.hello.api \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun deleted file mode 100644 index 96527ade82..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bndrun +++ /dev/null @@ -1,41 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.samples.conf;version=latest,\ - org.apache.felix.dependencymanager.samples.hello.api;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.samples/pom.xml new file mode 100644 index 0000000000..e50635d8ef --- /dev/null +++ b/dependencymanager/org.apache.felix.dependencymanager.samples/pom.xml @@ -0,0 +1,424 @@ + + + + 4.0.0 + + + org.apache.felix + dependencymanager-parent + 1.0.0-SNAPSHOT + ../pom.xml + + + org.apache.felix.dependencymanager.samples + 1.0.0-SNAPSHOT + jar + + Apache Felix Dependency Manager Samples + Samples of Apache Felix Dependency Manager + + + + true + true + true + + + + + org.osgi + osgi.core + + + org.osgi + osgi.cmpn + + + biz.aQute.bnd + biz.aQute.bnd.annotation + 3.5.0 + provided + + + org.apache.felix + org.apache.felix.dependencymanager + ${dependencymanager.version} + + + org.apache.felix + org.apache.felix.gogo.runtime + ${gogo.runtime.version} + provided + + + org.apache.felix + org.apache.felix.dependencymanager.runtime + ${dependencymanager.runtime.version} + + + org.apache.felix + org.apache.felix.dependencymanager.annotation + ${dependencymanager.annotation.version} + + + + + src + + + + org.apache.geronimo.genesis.plugins + tools-maven-plugin + + + verify-legal-files + none + + + + + + maven-jar-plugin + + + default-jar + none + + + + + org.apache.felix + maven-bundle-plugin + + + <_plugin>org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug;path:=${project.basedir}/../org.apache.felix.dependencymanager.annotation/target/org.apache.felix.dependencymanager.annotation-${dependencymanager.annotation.version}.jar + <_metatype>* + + + + + composite + package + + bundle + + + composite + + org.apache.felix.dependencymanager.samples.composite + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/composite=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/composite + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dependencymanager.samples.composite.Activator + Dependency Manager composite example + Dependency Manager Composite Example + + + + + compositefactory + package + + bundle + + + compositefactory + + org.apache.felix.dependencymanager.samples.compositefactory + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/compositefactory=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/compositefactory + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dependencymanager.samples.compositefactory.Activator + Dependency Manager composite factory example + Dependency Manager Composite Factory Example + + + + + conf + package + + bundle + + + conf + + org.apache.felix.dependencymanager.samples.conf + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/conf=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/conf + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dependencymanager.samples.conf.Activator + Dependency Manager examples configurations + Dependency Manager Examples Configurations + + + + + customdep + package + + bundle + + + customdep + + org.apache.felix.dependencymanager.samples.customdep + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/customdep=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/customdep + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dependencymanager.samples.customdep.Activator + Dependency Manager custom dependencies example + Dependency Manager Custom Dependencies Example + + + + + device.annot + package + + bundle + + + device.annot + + org.apache.felix.dependencymanager.samples.device.annot + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/device/annot=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/device/annot + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + Dependency Manager device example with annotations + Dependency Manager Device Example With Annotations + + + + + device.api + package + + bundle + + + device.api + + org.apache.felix.dependencymanager.samples.device.api + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/device/api=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/device/api + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dependencymanager.samples.device.api.Activator + Dependency Manager device example with api + Dependency Manager Device Example + + + + + dictionary.annot + package + + bundle + + + dictionary.annot + + org.apache.felix.dependencymanager.samples.dictionary.annot + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/dictionary/annot=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/dictionary/annot + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + Dependency Manager dictionary example with annotations + Dependency Manager Dictionary Example With Annotations + + + + + dictionary.api + package + + bundle + + + dictionary.api + + org.apache.felix.dependencymanager.samples.dictionary.api + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/dictionary/api=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/dictionary/api + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dependencymanager.samples.dictionary.api.Activator + Dependency Manager dictionary example with api + Dependency Manager Dictionary Example + + + + + dictionary.metatype + package + + bundle + + + dictionary.metatype + + org.apache.felix.dependencymanager.samples.dictionary.metatype + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/dictionary/metatype=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/dictionary/metatype + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dependencymanager.samples.dictionary.metatype.Activator + Dependency Manager dictionary example with api and metatype + Dependency Manager Dictionary Example + + + + + dynamicdep.annot + package + + bundle + + + dynamicdep.annot + + org.apache.felix.dependencymanager.samples.dynamicdep.annot + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/dynamicdep/annot=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/dynamicdep/annot + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + Dependency Manager dynamic dependency example with annotations + Dependency Manager Dynamic Dependency Example With Annotations + + + + + dynamicdep.api + package + + bundle + + + dynamicdep.api + + org.apache.felix.dependencymanager.samples.dynamicdep.api + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/dynamicdep/api=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/dynamicdep/api + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dependencymanager.samples.dynamicdep.api.Activator + Dependency Manager dynamic dependency example with api + Dependency Manager Dynamic Dependency Example + + + + + hello.annot + package + + bundle + + + hello.annot + + org.apache.felix.dependencymanager.samples.hello.annot + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/hello/annot=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/hello/annot + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + Dependency Manager hello example with annotations + Dependency Manager Hello Example With Annotations + + + + + hello.api + package + + bundle + + + hello.api + + org.apache.felix.dependencymanager.samples.hello.api + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/hello/api=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/hello/api + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dependencymanager.samples.hello.api.Activator + Dependency Manager hello example with API + Dependency Manager Hello Example + + + + + tpool + package + + bundle + + + tpool + + org.apache.felix.dependencymanager.samples.tpool + META-INF/DEPENDENCIES=${project.build.directory}/maven-shared-archive-resources/META-INF/DEPENDENCIES,META-INF/LICENSE=${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE,META-INF/NOTICE=${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE,org/apache/felix/dependencymanager/samples/tpool=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/tpool,org/apache/felix/dependencymanager/samples/tpool/executor=${project.build.outputDirectory}/org/apache/felix/dependencymanager/samples/tpool/executor + + + http://www.apache.org/licenses/LICENSE-2.0.txt + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html + The Apache Software Foundation + org.apache.felix.dependencymanager.samples.tpool.Activator + Dependency Manager threadpool used by examples + Dependency Manager Examples ThreadPool + + + + + + + + diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/src/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.samples/src/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/test/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.samples/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bnd deleted file mode 100644 index 809a515516..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bnd +++ /dev/null @@ -1,22 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Private-Package: \ - org.apache.felix.dependencymanager.samples.tpool,\ - org.apache.felix.dependencymanager.samples.tpool.executor -Bundle-Activator: org.apache.felix.dependencymanager.samples.tpool.Activator -Bundle-Description: Dependency Manager threadpool used by examples -Bundle-Name: Dependency Manager Examples ThreadPool \ No newline at end of file diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bndrun b/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bndrun deleted file mode 100644 index 7ee68cf216..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bndrun +++ /dev/null @@ -1,41 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --runfw: ${felix.framework} --runee: JavaSE-1.8 --runsystemcapabilities: ${native_capability} - --resolve.effective: active;skip:="osgi.service" - --runbundles: \ - ${metatype},\ - ${log},\ - ${gogo},\ - ${configadmin},\ - ${eventadmin},\ - org.apache.felix.dependencymanager;version=latest,\ - org.apache.felix.dependencymanager.shell;version=latest,\ - org.apache.felix.dependencymanager.runtime;version=latest,\ - org.apache.felix.dependencymanager.samples.tpool;version=latest - --runproperties: \ - org.apache.felix.dependencymanager.parallel='!org.apache.felix.dependencymanager.samples.tpool.executor, *',\ - org.apache.felix.dependencymanager.loglevel=2,\ - org.apache.felix.log.maxSize=100000,\ - org.apache.felix.log.storeDebug=true - - - diff --git a/dependencymanager/pom.xml b/dependencymanager/pom.xml index 52b52b5c13..c18093d365 100644 --- a/dependencymanager/pom.xml +++ b/dependencymanager/pom.xml @@ -57,6 +57,9 @@ org.apache.felix.dependencymanager.lambda.itest.lifecycle org.apache.felix.dependencymanager.lambda.itest.tests org.apache.felix.dependencymanager.runtime.itest + org.apache.felix.dependencymanager.samples + org.apache.felix.dependencymanager.lambda.samples + org.apache.felix.dependencymanager.benchmark From 115ae161bdcc37d756aab7a30979a2017cb9c725 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 24 Oct 2026 20:17:39 +0000 Subject: [PATCH 12/12] FELIX-6872 - Dependency Manager: remove the Gradle build Remove the Gradle build and wrapper, the bnd workspace, the Eclipse project files and the Gradle based release project, which the Maven build replaces, and build the Dependency Manager with Maven in CI. The README describes the Maven build, and the changelogs get an entry for the new versions, the existing entries are kept. Co-Authored-By: Claude Sonnet 5.5 Claude-Session: https://claude.ai/code/session_017MGDWAYvWioowRTBkoQPjA --- .github/workflows/maven-ci.yml | 13 +- dependencymanager/.gitignore | 13 +- .../.gradle-wrapper/gradle-wrapper.properties | 23 -- dependencymanager/README | 25 +- dependencymanager/build.gradle | 30 -- dependencymanager/changelog.txt | 18 + dependencymanager/cnf/.classpath | 6 - dependencymanager/cnf/.gitignore | 3 - dependencymanager/cnf/.project | 11 - dependencymanager/cnf/build.bnd | 75 ---- dependencymanager/cnf/ext/junit.bnd | 19 - dependencymanager/cnf/ext/libraries.bnd | 82 ----- dependencymanager/cnf/repository.mvn | 55 --- dependencymanager/docs/.project | 11 - dependencymanager/gradle.properties | 26 -- dependencymanager/gradlew | 178 ---------- .../.classpath | 12 - .../.gitignore | 3 - .../.project | 23 -- .../bnd.bnd | 30 -- .../changelog.txt | 18 + .../src/.gitignore | 0 .../test/.gitignore | 0 .../.classpath | 12 - .../.gitignore | 3 - .../.project | 23 -- .../bnd.bnd | 31 -- .../changelog.txt | 18 + .../src/.gitignore | 0 .../test/.gitignore | 0 .../.classpath | 12 - .../.gitignore | 3 - .../.project | 23 -- .../.settings/org.eclipse.jdt.core.prefs | 326 ------------------ .../.settings/org.eclipse.jdt.ui.prefs | 3 - .../bnd.bnd | 36 -- .../changelog.txt | 18 + .../src/.gitignore | 0 .../test/.gitignore | 0 .../.classpath | 12 - .../.gitignore | 3 - .../.project | 23 -- .../bnd.bnd | 37 -- .../changelog.txt | 18 + .../src/.gitignore | 0 .../test/.gitignore | 0 .../.classpath | 12 - .../.gitignore | 3 - .../.project | 23 -- .../bnd.bnd | 53 --- .../changelog.txt | 18 + .../src/.gitignore | 0 dependencymanager/release/.classpath | 12 - dependencymanager/release/.gitignore | 3 - dependencymanager/release/.project | 23 -- dependencymanager/release/README.release | 136 -------- dependencymanager/release/bnd.bnd | 27 -- dependencymanager/release/build.gradle | 297 ---------------- .../release/check_staged_release.sh | 119 ------- dependencymanager/release/rat.gradle | 97 ------ .../release/resources/bin/LICENSE | 203 ----------- .../release/resources/bin/NOTICE | 11 - .../release/resources/bin/README.bin | 53 --- .../release/resources/src/LICENSE | 202 ----------- .../release/resources/src/NOTICE | 11 - .../release/resources/src/README.src | 109 ------ dependencymanager/release/src/.gitignore | 0 dependencymanager/release/test/.gitignore | 0 dependencymanager/settings.gradle | 25 -- 69 files changed, 137 insertions(+), 2575 deletions(-) delete mode 100644 dependencymanager/.gradle-wrapper/gradle-wrapper.properties delete mode 100644 dependencymanager/build.gradle delete mode 100644 dependencymanager/cnf/.classpath delete mode 100644 dependencymanager/cnf/.gitignore delete mode 100644 dependencymanager/cnf/.project delete mode 100644 dependencymanager/cnf/build.bnd delete mode 100644 dependencymanager/cnf/ext/junit.bnd delete mode 100644 dependencymanager/cnf/ext/libraries.bnd delete mode 100644 dependencymanager/cnf/repository.mvn delete mode 100644 dependencymanager/docs/.project delete mode 100644 dependencymanager/gradle.properties delete mode 100755 dependencymanager/gradlew delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.annotation/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.annotation/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.annotation/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.annotation/src/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.annotation/test/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda/src/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.lambda/test/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime/src/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.runtime/test/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.shell/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.shell/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.shell/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.shell/src/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager.shell/test/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager/.classpath delete mode 100644 dependencymanager/org.apache.felix.dependencymanager/.gitignore delete mode 100644 dependencymanager/org.apache.felix.dependencymanager/.project delete mode 100644 dependencymanager/org.apache.felix.dependencymanager/bnd.bnd delete mode 100644 dependencymanager/org.apache.felix.dependencymanager/src/.gitignore delete mode 100644 dependencymanager/release/.classpath delete mode 100644 dependencymanager/release/.gitignore delete mode 100644 dependencymanager/release/.project delete mode 100644 dependencymanager/release/README.release delete mode 100644 dependencymanager/release/bnd.bnd delete mode 100644 dependencymanager/release/build.gradle delete mode 100755 dependencymanager/release/check_staged_release.sh delete mode 100644 dependencymanager/release/rat.gradle delete mode 100644 dependencymanager/release/resources/bin/LICENSE delete mode 100644 dependencymanager/release/resources/bin/NOTICE delete mode 100644 dependencymanager/release/resources/bin/README.bin delete mode 100644 dependencymanager/release/resources/src/LICENSE delete mode 100644 dependencymanager/release/resources/src/NOTICE delete mode 100644 dependencymanager/release/resources/src/README.src delete mode 100644 dependencymanager/release/src/.gitignore delete mode 100644 dependencymanager/release/test/.gitignore delete mode 100644 dependencymanager/settings.gradle diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml index d569185557..66b1ed881c 100644 --- a/.github/workflows/maven-ci.yml +++ b/.github/workflows/maven-ci.yml @@ -198,17 +198,11 @@ jobs: - name: Felix examples if: steps.changes.outputs.examples == 'true' run: mvn -B -V -Dstyle.color=always --file examples/pom.xml clean verify - # The Dependency Manager is built with Gradle and bnd rather than Maven. It runs last, - # on the framework, Gogo and Config Admin snapshots installed into the local Maven - # repository by the steps above. + # The Dependency Manager runs last. Its integration tests run on the framework, Gogo and + # Config Admin built and installed by the steps above, see FELIX-6870. - name: Felix Dependency Manager if: steps.changes.outputs.dependencymanager == 'true' - working-directory: dependencymanager - run: | - # The annotation bundle is a bnd plugin used by the other projects. It has to exist - # before they are configured, so it is built in a separate Gradle invocation. - ./gradlew --no-daemon --console=plain org.apache.felix.dependencymanager.annotation:jar - ./gradlew --no-daemon --console=plain build + run: mvn -B -V -Dstyle.color=always --file dependencymanager/pom.xml clean verify "-Dframework.version=$FRAMEWORK_VERSION" "-Dconfigadmin.version=$CONFIGADMIN_VERSION" "-Dgogo.runtime.version=$GOGO_RUNTIME_VERSION" "-Dgogo.shell.version=$GOGO_SHELL_VERSION" "-Dgogo.command.version=$GOGO_COMMAND_VERSION" - name: Upload Test Results if: always() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 @@ -219,4 +213,5 @@ jobs: ${{ github.workspace }}/**/target/surefire-reports/*.xml ${{ github.workspace }}/**/target/failsafe-reports/*.xml ${{ github.workspace }}/**/target/test-reports/tck/*.xml + ${{ github.workspace }}/dependencymanager/**/target/test-reports/test/*.xml diff --git a/dependencymanager/.gitignore b/dependencymanager/.gitignore index 87ec39ae7b..88bf8e6ae4 100644 --- a/dependencymanager/.gitignore +++ b/dependencymanager/.gitignore @@ -1,13 +1,4 @@ -/.gradle/ -/reports/ -/generated/ -/.metadata/ -/.recommenders/ -/RemoteSystemsTempFiles/ -/rat-report.xml - -/build/ -/cnf/localrepo/ -/cnf/releaserepo/ /target/ **/target/ +/generated/ +**/generated/ diff --git a/dependencymanager/.gradle-wrapper/gradle-wrapper.properties b/dependencymanager/.gradle-wrapper/gradle-wrapper.properties deleted file mode 100644 index 8364c22200..0000000000 --- a/dependencymanager/.gradle-wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip diff --git a/dependencymanager/README b/dependencymanager/README index 6cd3557eba..ded294e9d4 100644 --- a/dependencymanager/README +++ b/dependencymanager/README @@ -21,12 +21,33 @@ Welcome to Apache Felix Dependency Manager Apache Felix Dependency Manager is a versatile java API, allowing to declaratively register, acquire, and manage dynamic OSGi services. -Please refer to release/resources/src/README +The bundles are documented on the website: + + http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html Building and testing Apache Felix Dependency Manager ==================================================== -The build instructions can be found from release/resources/src/README.src +Apache Felix Dependency Manager is built with Maven (a recent JDK, 11 or later, is required): + + mvn clean install + +This builds the bundles, runs their unit tests and runs the OSGi integration tests inside a +framework (bnd-testing-maven-plugin). The framework, Gogo and Config Admin modules of this +repository, which the integration tests run on, have to be installed in the local Maven +repository first, or be available as released versions. + +The modules are: + + org.apache.felix.dependencymanager the Dependency Manager API and implementation + org.apache.felix.dependencymanager.annotation the annotations and the bnd plugin which processes them + org.apache.felix.dependencymanager.runtime loads the components declared with annotations + org.apache.felix.dependencymanager.shell the Gogo shell commands + org.apache.felix.dependencymanager.lambda the lambda based API + org.apache.felix.dependencymanager.*.itest.* the integration tests + org.apache.felix.dependencymanager.samples samples, see org.apache.felix.dependencymanager.samples/README.samples + org.apache.felix.dependencymanager.lambda.samples + org.apache.felix.dependencymanager.benchmark a stress test, see org.apache.felix.dependencymanager.benchmark/README Getting Started =============== diff --git a/dependencymanager/build.gradle b/dependencymanager/build.gradle deleted file mode 100644 index 8219eef85e..0000000000 --- a/dependencymanager/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -tasks.named('wrapper') { - jarFile = rootProject.file('.gradle-wrapper/gradle-wrapper.jar') -} - -// The bnd launcher based integration tests run in the testOSGi task, so the plain -// Gradle test task of those projects legitimately has no tests to discover. -subprojects { - tasks.withType(Test).configureEach { - failOnNoDiscoveredTests = false - } -} diff --git a/dependencymanager/changelog.txt b/dependencymanager/changelog.txt index 2672e66815..b0b4139681 100644 --- a/dependencymanager/changelog.txt +++ b/dependencymanager/changelog.txt @@ -1,3 +1,21 @@ +Release Notes - Felix - Dependency Manager +========================================== + +** List of bundles being part of the release: + * org.apache.felix.dependencymanager; version=5.0.0 + * org.apache.felix.dependencymanager.shell; version=5.0.0 + * org.apache.felix.dependencymanager.runtime; version=5.0.0 + * org.apache.felix.dependencymanager.annotation; version=6.0.0 + * org.apache.felix.dependencymanager.lambda; version=2.0.0 + +** Improvement + * [FELIX-6872] - Support current JDKs (up to Java 25) and build the Dependency Manager with Maven + + The minimum Java version is now 11, which is why the bundles get a new major version. + The exported packages are unchanged compared with the previous release. + The bundles are still compiled against OSGi R6, so their imports have not changed. + The deprecated use of AccessController in the service tracker and in the runtime has been removed. + Release Notes - Felix - Version org.apache.felix.dependencymanager-r16 ====================================================================== diff --git a/dependencymanager/cnf/.classpath b/dependencymanager/cnf/.classpath deleted file mode 100644 index fb5011632c..0000000000 --- a/dependencymanager/cnf/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/dependencymanager/cnf/.gitignore b/dependencymanager/cnf/.gitignore deleted file mode 100644 index 120f0c4575..0000000000 --- a/dependencymanager/cnf/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/generated/ -/cache/ diff --git a/dependencymanager/cnf/.project b/dependencymanager/cnf/.project deleted file mode 100644 index 1397bbe620..0000000000 --- a/dependencymanager/cnf/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - cnf - - - - - - - - diff --git a/dependencymanager/cnf/build.bnd b/dependencymanager/cnf/build.bnd deleted file mode 100644 index fc975a5a95..0000000000 --- a/dependencymanager/cnf/build.bnd +++ /dev/null @@ -1,75 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# -# Set here bnd repositories -# --plugin.1.Release: aQute.bnd.deployer.repository.LocalIndexedRepo; \ - name=Release; \ - local=${workspace}/cnf/releaserepo; \ - pretty=true - --plugin.2.Local: aQute.bnd.deployer.repository.LocalIndexedRepo; \ - name=Local; \ - local=${workspace}/cnf/localrepo; \ - pretty=true - --plugin.3.Repository: aQute.bnd.repository.maven.provider.MavenBndRepository; \ - releaseUrl = 'https://repo1.maven.org/maven2'; \ - name = Repository; \ - index = ${.}/repository.mvn; \ - noupdateOnRelease=true - -# -# configure release and baseline repos -# --releaserepo: Release --baselinerepo: Repository --baseline: * - -# -# Set here the maven group id for the workspace bundles -# --pom: groupid = org.apache.felix - -# -# do not include pom dependencies -# --maven-dependencies: - -# -# Don't include sources in generated bundles -# --sources: true - -# -# Java parameters -# -javac.source: 11 -javac.target: 11 - -# -# Removes some headers in order to reduce binary diff between same bundles that are not changed between subsequent releases. -# --removeheaders: Bnd-LastModified,Tool,Created-By,Include-Resource - -# -# Add pom scm section in generated poms -# -Bundle-SCM: \ - url='https://gitbox.apache.org/repos/asf?p=felix-dev.git',\ - connection='scm:git:https://github.com/apache/felix-dev.git',\ - developerConnection='scm:git:https://github.com/apache/felix-dev.git' diff --git a/dependencymanager/cnf/ext/junit.bnd b/dependencymanager/cnf/ext/junit.bnd deleted file mode 100644 index 99bc945e5f..0000000000 --- a/dependencymanager/cnf/ext/junit.bnd +++ /dev/null @@ -1,19 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -junit: org.apache.servicemix.bundles.junit; version=4.13.2 -test-reports: test-results diff --git a/dependencymanager/cnf/ext/libraries.bnd b/dependencymanager/cnf/ext/libraries.bnd deleted file mode 100644 index 2bcb86467a..0000000000 --- a/dependencymanager/cnf/ext/libraries.bnd +++ /dev/null @@ -1,82 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -## -# metatype service -metatype=org.apache.felix.metatype;version=1.2.4 - -## -# log service -log=org.apache.felix.log;version=1.3.2 - -## -# Gogo bundles -gogo=\ - org.apache.felix.gogo.command;version=latest,\ - org.apache.felix.gogo.runtime;version=latest,\ - org.apache.felix.gogo.shell;version=latest,\ - org.jline;version=3.29.0,\ - org.fusesource.jansi;version=1.16.0 - - -## -# Configuration Admin -configadmin=org.apache.felix.configadmin;version=latest - -## -# Event Admin -eventadmin=org.apache.felix.eventadmin;version=1.4.4 - -## -# Web Console -webconsole=\ - org.apache.felix.http.api;version=3.0.0,\ - org.apache.felix.http.servlet-api;version=1.1.2,\ - org.apache.felix.http.jetty;version="[3.4.8,3.4.9]",\ - org.apache.felix.webconsole;version=4.3.4,\ - org.apache.commons.fileupload;version=1.2.1,\ - org.apache.commons.io;version=2.4.0 - -## -# bndlib -bndlib=biz.aQute.bndlib;version=7.4.0 - -## -# mockito -mockito=\ - org.mockito.mockito-core;version=5.24.0,\ - net.bytebuddy.byte-buddy;version=1.17.7,\ - net.bytebuddy.byte-buddy-agent;version=1.17.7 - -## -# objenesis -objenesis=org.objenesis;version=3.3 - -## -# runtime dependencies used by integration tests -# -itest.run=\ - org.apache.servicemix.bundles.junit;version=4.13.2,\ - org.mockito.mockito-core;version='[5.24.0,5.25)',\ - net.bytebuddy.byte-buddy;version='[1.17.7,1.18)',\ - net.bytebuddy.byte-buddy-agent;version='[1.17.7,1.18)',\ - org.objenesis;version='[3.3.0,3.3.1)' - -## -# Felix Framework -# -felix.framework=org.apache.felix.framework;version='[8.0.0,9)' diff --git a/dependencymanager/cnf/repository.mvn b/dependencymanager/cnf/repository.mvn deleted file mode 100644 index ebebab0bbf..0000000000 --- a/dependencymanager/cnf/repository.mvn +++ /dev/null @@ -1,55 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -ant:ant:1.5 -biz.aQute.bnd:biz.aQute.bnd.gradle:7.4.0 -biz.aQute.bnd:biz.aQute.bndlib:7.4.0 -org.apache.felix:org.apache.felix.framework:8.0.0-SNAPSHOT -org.apache.felix:org.apache.felix.eventadmin:1.4.4 -org.apache.felix:org.apache.felix.gogo.command:1.1.3-SNAPSHOT -org.apache.felix:org.apache.felix.gogo.shell:1.1.5-SNAPSHOT -org.apache.felix:org.apache.felix.gogo.runtime:1.2.0-SNAPSHOT -org.jline:jline:3.29.0 -org.apache.felix:org.apache.felix.http.api:3.0.0 -org.apache.felix:org.apache.felix.http.servlet-api:1.1.2 -org.apache.felix:org.apache.felix.configadmin:1.10.0-SNAPSHOT -org.apache.felix:org.apache.felix.log:1.3.2 -org.apache.felix:org.apache.felix.metatype:1.2.4 -org.apache.felix:org.apache.felix.http.jetty:3.4.8 -org.apache.felix:org.apache.felix.webconsole:4.3.4 -org.apache.felix:org.apache.felix.dependencymanager:4.6.1 -org.apache.felix:org.apache.felix.dependencymanager.annotation:5.0.2 -org.apache.felix:org.apache.felix.dependencymanager.lambda:1.2.2 -org.apache.felix:org.apache.felix.dependencymanager.runtime:4.0.8 -org.apache.felix:org.apache.felix.dependencymanager.shell:4.0.9 -org.jline:jline-builtins:3.3.0 -org.apache.servicemix.bundles:org.apache.servicemix.bundles.junit:4.13.2_1 -org.mockito:mockito-core:5.24.0 -net.bytebuddy:byte-buddy:1.17.7 -net.bytebuddy:byte-buddy-agent:1.17.7 -org.objenesis:objenesis:3.3 -org.osgi:osgi.annotation:8.1.0 -org.osgi:osgi.cmpn:7.0.0 -org.osgi:osgi.core:8.0.0 -biz.aQute.bnd:biz.aQute.bnd.annotation:3.5.0 -org.slf4j:slf4j-simple:1.7.7 -org.slf4j:slf4j-api:1.7.7 -commons-fileupload:commons-fileupload:1.2.1 -org.fusesource.jansi:jansi:1.16 -commons-io:commons-io:2.4 - - diff --git a/dependencymanager/docs/.project b/dependencymanager/docs/.project deleted file mode 100644 index e248a4fa70..0000000000 --- a/dependencymanager/docs/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - docs - - - - - - - - diff --git a/dependencymanager/gradle.properties b/dependencymanager/gradle.properties deleted file mode 100644 index a36e805284..0000000000 --- a/dependencymanager/gradle.properties +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -bnd_version=7.4.0 -# bnd_plugin is the dependency declaration for the bnd gradle plugin -bnd_plugin=biz.aQute.bnd:biz.aQute.bnd.gradle:7.4.0 - -org.gradle.jvmargs=-Xmx2g - - diff --git a/dependencymanager/gradlew b/dependencymanager/gradlew deleted file mode 100755 index 6a4bf153fc..0000000000 --- a/dependencymanager/gradlew +++ /dev/null @@ -1,178 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -if [ ! -f $APP_HOME/.gradle-wrapper/gradle-wrapper.jar ] -then - mkdir -p $APP_HOME/.gradle-wrapper - curl https://raw.githubusercontent.com/gradle/gradle/master/gradle/wrapper/gradle-wrapper.jar -o $APP_HOME/.gradle-wrapper/gradle-wrapper.jar -fi - -CLASSPATH=$APP_HOME/.gradle-wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/.classpath b/dependencymanager/org.apache.felix.dependencymanager.annotation/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.annotation/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.annotation/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.annotation/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/.project b/dependencymanager/org.apache.felix.dependencymanager.annotation/.project deleted file mode 100644 index 35b34cacf3..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.annotation/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager.annotation - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd deleted file mode 100644 index 06ad54cc73..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.annotation/bnd.bnd +++ /dev/null @@ -1,30 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Bundle-Version: 6.0.0 --buildpath: \ - osgi.core;version=8.0,\ - osgi.cmpn;version=7.0,\ - biz.aQute.bndlib;version=7.4.0 -Private-Package: org.apache.felix.dm.annotation.plugin.bnd -Export-Package: org.apache.felix.dm.annotation.api -Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt -Bundle-Name: Apache Felix Dependency Manager Annotations -Bundle-Description: Annotations for Apache Felix Dependency Manager -Bundle-Category: osgi -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Vendor: The Apache Software Foundation -Bundle-DocURL: http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations.html diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.annotation/changelog.txt index 0dfd0db301..efcb2b3f73 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.annotation/changelog.txt +++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/changelog.txt @@ -1,3 +1,21 @@ +Release Notes - Felix - Version org.apache.felix.dependencymanager.annotation-6.0.0 +=================================================================================== + +** List of bundles being part of the release: + * org.apache.felix.dependencymanager; version=5.0.0 + * org.apache.felix.dependencymanager.shell; version=5.0.0 + * org.apache.felix.dependencymanager.runtime; version=5.0.0 + * org.apache.felix.dependencymanager.annotation; version=6.0.0 + * org.apache.felix.dependencymanager.lambda; version=2.0.0 + +** Improvement + * [FELIX-6872] - Support current JDKs (up to Java 25) and build the Dependency Manager with Maven + + The minimum Java version is now 11, which is why the bundles get a new major version. + The exported packages are unchanged compared with the previous release. + The bundles are still compiled against OSGi R6, so their imports have not changed. + The deprecated use of AccessController in the service tracker and in the runtime has been removed. + Release Notes - Felix - Version org.apache.felix.dependencymanager-r16 ====================================================================== diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/src/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.annotation/src/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/test/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.annotation/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/.classpath b/dependencymanager/org.apache.felix.dependencymanager.lambda/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.lambda/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/.project b/dependencymanager/org.apache.felix.dependencymanager.lambda/.project deleted file mode 100644 index fcd766fcc5..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager.lambda - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd deleted file mode 100644 index c0fc44827e..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda/bnd.bnd +++ /dev/null @@ -1,31 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -javac.source: 11 -javac.target: 11 -Bundle-Version: 2.0.0 --buildpath: \ - org.apache.felix.dependencymanager;version=latest,\ - osgi.core;version=8.0,\ - osgi.cmpn;version=7.0,\ - osgi.annotation;version=8.1 -Export-Package: \ - org.apache.felix.dm.lambda,\ - org.apache.felix.dm.lambda.callbacks --runfw: org.apache.felix.framework;version='[8.0.0,9)' --runee: JavaSE-11 -Private-Package: org.apache.felix.dm.lambda.impl -Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.lambda/changelog.txt index 7072771220..6ad4b78815 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.lambda/changelog.txt +++ b/dependencymanager/org.apache.felix.dependencymanager.lambda/changelog.txt @@ -1,3 +1,21 @@ +Release Notes - Felix - Version org.apache.felix.dependencymanager.lambda-2.0.0 +=============================================================================== + +** List of bundles being part of the release: + * org.apache.felix.dependencymanager; version=5.0.0 + * org.apache.felix.dependencymanager.shell; version=5.0.0 + * org.apache.felix.dependencymanager.runtime; version=5.0.0 + * org.apache.felix.dependencymanager.annotation; version=6.0.0 + * org.apache.felix.dependencymanager.lambda; version=2.0.0 + +** Improvement + * [FELIX-6872] - Support current JDKs (up to Java 25) and build the Dependency Manager with Maven + + The minimum Java version is now 11, which is why the bundles get a new major version. + The exported packages are unchanged compared with the previous release. + The bundles are still compiled against OSGi R6, so their imports have not changed. + The deprecated use of AccessController in the service tracker and in the runtime has been removed. + Release Notes - Felix - Version org.apache.felix.dependencymanager-r16 ====================================================================== diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/src/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.lambda/src/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/test/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.lambda/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/.classpath b/dependencymanager/org.apache.felix.dependencymanager.runtime/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.runtime/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/.project b/dependencymanager/org.apache.felix.dependencymanager.runtime/.project deleted file mode 100644 index 56b71cc986..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager.runtime - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs b/dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 27da04a704..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,326 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=false -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false -org.eclipse.jdt.core.formatter.comment.format_line_comments=false -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=1 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.ui.prefs b/dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 4cbb76b350..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -formatter_profile=_Apache Felix Eclipse Template -formatter_settings_version=13 diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd deleted file mode 100644 index def3055b76..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime/bnd.bnd +++ /dev/null @@ -1,36 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -Bundle-Version: 5.0.0 --buildpath: \ - osgi.core;version=4.2,\ - osgi.cmpn;version=4.2,\ - org.apache.felix.dependencymanager;version=latest -Bundle-Activator:org.apache.felix.dm.runtime.Activator -Private-Package: \ - org.apache.felix.dm.runtime -Export-Package: \ - org.apache.felix.dm.runtime.api -Provide-Capability: osgi.extender; osgi.extender="org.apache.felix.dependencymanager.runtime";\ - uses:="org.apache.felix.dm";version:Version="4.0.0" -Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt -Bundle-Name: Apache Felix Dependency Manager Runtime -Bundle-Description: Loads Apache Felix Dependency Manager component descriptors from active \ - annoted bundles -Bundle-Category: osgi -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Vendor: The Apache Software Foundation -Bundle-ContactAddress: http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.runtime/changelog.txt index 7072771220..0aee07c470 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.runtime/changelog.txt +++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/changelog.txt @@ -1,3 +1,21 @@ +Release Notes - Felix - Version org.apache.felix.dependencymanager.runtime-5.0.0 +================================================================================ + +** List of bundles being part of the release: + * org.apache.felix.dependencymanager; version=5.0.0 + * org.apache.felix.dependencymanager.shell; version=5.0.0 + * org.apache.felix.dependencymanager.runtime; version=5.0.0 + * org.apache.felix.dependencymanager.annotation; version=6.0.0 + * org.apache.felix.dependencymanager.lambda; version=2.0.0 + +** Improvement + * [FELIX-6872] - Support current JDKs (up to Java 25) and build the Dependency Manager with Maven + + The minimum Java version is now 11, which is why the bundles get a new major version. + The exported packages are unchanged compared with the previous release. + The bundles are still compiled against OSGi R6, so their imports have not changed. + The deprecated use of AccessController in the service tracker and in the runtime has been removed. + Release Notes - Felix - Version org.apache.felix.dependencymanager-r16 ====================================================================== diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/src/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.runtime/src/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/test/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.runtime/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/.classpath b/dependencymanager/org.apache.felix.dependencymanager.shell/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.shell/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.shell/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.shell/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/.project b/dependencymanager/org.apache.felix.dependencymanager.shell/.project deleted file mode 100644 index bb43ab1429..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.shell/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager.shell - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd deleted file mode 100644 index a266661fda..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager.shell/bnd.bnd +++ /dev/null @@ -1,37 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --buildpath: \ - ${mockito},\ - org.apache.felix.dependencymanager;version=latest,\ - ${junit},\ - osgi.core;version=8.0,\ - osgi.cmpn;version=7.0,\ - org.apache.felix.gogo.runtime;version=latest -Private-Package: \ - org.apache.felix.dm.shell -Bundle-Activator:org.apache.felix.dm.shell.Activator -Bundle-Version: 5.0.0 -Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt -Bundle-Name: Apache Felix Dependency Manager Shell -Bundle-Description: Gogo Shell commands for Apache Felix Dependency Manager -Bundle-Category: osgi -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Vendor: The Apache Software Foundation --testpath: \ - ${junit},\ - ${mockito},\ - org.objenesis;version=3.3 diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.shell/changelog.txt index 7072771220..c4c22bb283 100644 --- a/dependencymanager/org.apache.felix.dependencymanager.shell/changelog.txt +++ b/dependencymanager/org.apache.felix.dependencymanager.shell/changelog.txt @@ -1,3 +1,21 @@ +Release Notes - Felix - Version org.apache.felix.dependencymanager.shell-5.0.0 +============================================================================== + +** List of bundles being part of the release: + * org.apache.felix.dependencymanager; version=5.0.0 + * org.apache.felix.dependencymanager.shell; version=5.0.0 + * org.apache.felix.dependencymanager.runtime; version=5.0.0 + * org.apache.felix.dependencymanager.annotation; version=6.0.0 + * org.apache.felix.dependencymanager.lambda; version=2.0.0 + +** Improvement + * [FELIX-6872] - Support current JDKs (up to Java 25) and build the Dependency Manager with Maven + + The minimum Java version is now 11, which is why the bundles get a new major version. + The exported packages are unchanged compared with the previous release. + The bundles are still compiled against OSGi R6, so their imports have not changed. + The deprecated use of AccessController in the service tracker and in the runtime has been removed. + Release Notes - Felix - Version org.apache.felix.dependencymanager-r16 ====================================================================== diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/src/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.shell/src/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/test/.gitignore b/dependencymanager/org.apache.felix.dependencymanager.shell/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/org.apache.felix.dependencymanager/.classpath b/dependencymanager/org.apache.felix.dependencymanager/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager/.gitignore b/dependencymanager/org.apache.felix.dependencymanager/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/org.apache.felix.dependencymanager/.project b/dependencymanager/org.apache.felix.dependencymanager/.project deleted file mode 100644 index 8640bab88c..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - org.apache.felix.dependencymanager - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd deleted file mode 100644 index 8be859759b..0000000000 --- a/dependencymanager/org.apache.felix.dependencymanager/bnd.bnd +++ /dev/null @@ -1,53 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --buildpath: \ - ${mockito},\ - ${junit},\ - osgi.core;version=8.0,\ - osgi.cmpn;version=7.0,\ - osgi.annotation;version=8.1 -Private-Package: \ - org.apache.felix.dm.impl,\ - org.apache.felix.dm.impl.index,\ - org.apache.felix.dm.impl.index.multiproperty,\ - org.apache.felix.dm.impl.metatype -Export-Package: \ - org.apache.felix.dm,\ - org.apache.felix.dm.compat,\ - org.apache.felix.dm.tracker,\ - org.apache.felix.dm.context,\ - org.apache.felix.dm.diagnostics -Include-Resource: META-INF/=resources/,META-INF/changelog.txt=changelog.txt -Import-Package: !org.junit,!org.mockito.*,org.osgi.framework;version="[1.8, 2)",* -Bundle-Activator: org.apache.felix.dm.impl.Activator -Bundle-Version: 5.0.0 -Bundle-Name: Apache Felix Dependency Manager -Bundle-Description: Provides dynamic service and component dependency management -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-DocURL: http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html -Bundle-Vendor: The Apache Software Foundation -Bundle-Category: osgi - --testpath: \ - ${junit},\ - ${mockito},\ - org.objenesis;version=3.3 - - - - - diff --git a/dependencymanager/org.apache.felix.dependencymanager/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager/changelog.txt index 79be51a495..a976ed065f 100644 --- a/dependencymanager/org.apache.felix.dependencymanager/changelog.txt +++ b/dependencymanager/org.apache.felix.dependencymanager/changelog.txt @@ -1,3 +1,21 @@ +Release Notes - Felix - Version org.apache.felix.dependencymanager-5.0.0 +======================================================================== + +** List of bundles being part of the release: + * org.apache.felix.dependencymanager; version=5.0.0 + * org.apache.felix.dependencymanager.shell; version=5.0.0 + * org.apache.felix.dependencymanager.runtime; version=5.0.0 + * org.apache.felix.dependencymanager.annotation; version=6.0.0 + * org.apache.felix.dependencymanager.lambda; version=2.0.0 + +** Improvement + * [FELIX-6872] - Support current JDKs (up to Java 25) and build the Dependency Manager with Maven + + The minimum Java version is now 11, which is why the bundles get a new major version. + The exported packages are unchanged compared with the previous release. + The bundles are still compiled against OSGi R6, so their imports have not changed. + The deprecated use of AccessController in the service tracker and in the runtime has been removed. + Release Notes - Felix - Version org.apache.felix.dependencymanager-r16 ====================================================================== diff --git a/dependencymanager/org.apache.felix.dependencymanager/src/.gitignore b/dependencymanager/org.apache.felix.dependencymanager/src/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/release/.classpath b/dependencymanager/release/.classpath deleted file mode 100644 index 7a6fc25436..0000000000 --- a/dependencymanager/release/.classpath +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/dependencymanager/release/.gitignore b/dependencymanager/release/.gitignore deleted file mode 100644 index 90dde36e4a..0000000000 --- a/dependencymanager/release/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/bin/ -/bin_test/ -/generated/ diff --git a/dependencymanager/release/.project b/dependencymanager/release/.project deleted file mode 100644 index 46fcd83084..0000000000 --- a/dependencymanager/release/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - release - - - - - - org.eclipse.jdt.core.javabuilder - - - - - bndtools.core.bndbuilder - - - - - - org.eclipse.jdt.core.javanature - bndtools.core.bndnature - - diff --git a/dependencymanager/release/README.release b/dependencymanager/release/README.release deleted file mode 100644 index 7d52f40d7e..0000000000 --- a/dependencymanager/release/README.release +++ /dev/null @@ -1,136 +0,0 @@ - - - -Apache Felix Dependency Manager Release Guide -This document describes how to do a source release. It is based on the Release FAQ [1] - -Prerequisites -============= - -To create a release you must: - -* Have a Jdk8 (at least version 1.8.0_71) installed on your system; -* Have Subversion installed on your system; -* Have gpg installed on your system; -* Have a public key added to the keys file, and committed to [2] -* If you are using an http proxy, configure the following; for example: - - export GRADLE_OPTS="-Dhttps.proxyHost=www.somehost.org -Dhttps.proxyPort=8080" - export http_proxy=www.somehost.org:8080 - export https_proxy=www.somehost.org:8080 - -Before you can start staging a release candidate, you must: - -* make sure there are no dependencies on snapshots/unreleased versions; -* increment the ext.dmRelease parameter in release/build.gradle, if not already done, and commit. -* check if workspace and module changelogs are up-to-date. -* in the changelog files, also make sure that all bundles which are part of the release are all referenced (bundle names + versions). -* release the bundles that are part of the dm binary distribution. -* create a tagged version of the sources in preparation of the release candidate. - -Create a tagged version -======================= - -Creating a tagged version of the sources can be done directly through svn (replace r by the actual release number, like "r1"): - -git tag -a org.apache.felix.dependencymanager-r -m "Release of Apache Felix Dependency Manager r" -git push origin org.apache.felix.dependencymanager-r - -Staging a release candidate -=========================== - -Staging a release starts by checking out a tagged version of the sources (replace r by the actual release number, like "r1"): - -git clone -–depth 1 -b org.apache.felix.dependencymanager-r http://gitbox.apache.org/repos/asf/felix-dev.git felix-dev-org.apache.felix.dependencymanager-r - -The next step is to build/test the software and create the release/staging/ directory (where the source/jars will be packaged): -(replace r by the actual release number, like "r1") - -Use a Java8 JDK - -$ cd felix-dev-org.apache.felix.dependencymanager-r/dependencymanager -$ ./gradlew rat -$ ./gradlew org.apache.felix.dependencymanager.annotation:jar -$ ./gradlew jar -$ ./gradlew test -$ ./gradlew check -$ ./gradlew release --no-daemon - -The last command (gradlew release) will create the binary release artifacts in cnf/releaserepo/ directory. - -- create the staging: - -$ ./gradlew makeStaging --no-daemon - -The above will create ./release/staging/ directory. Then you sign archives by invoking the following task: - -$ ./gradlew signStaging --no-daemon - -(you will be asked to enter your PGP key password; don't forget the --no-daemon option, else stdin won't be read) - -You can upload the archives and the signatures to our development area, which we use to stage this release candidate. This development area can be found at -https://dist.apache.org/repos/dist/dev/felix and adding files to it can be done using "svnpubsub" which is taken care of by the following target: - -$ ./gradlew commitToStaging --no-daemon - -Voting on the release -===================== - -Start a vote on the dev@felix.apache.org list, for example (be sure to replace r with the correct release number, like "r1"): - ->>> -To: "Felix Developers List" -Subject: [VOTE] Release of Apache Felix Dependency Manager release r - -I would like to call for a vote on the Dependency Manager top level release r - -We solved N issues in this release: -http://issues.apache.org/jira/... - -There are still some outstanding issues: -http://issues.apache.org/jira/... - -Staging repository: -https://dist.apache.org/repos/dist/dev/felix/apache-felix-dependencymanager-r/ - -You can use this UNIX script to download the release and verify the signatures: - -https://github.com/apache/felix-dev/blob/master/dependencymanager/release/check_staged_release.sh - -Usage: - - sh check_staged_release.sh r /tmp/felix-staging - -This script, unlike the original Felix check_stage_release.sh, is specific -to the Dependency Manager release process (see FELIX-4818) and will -download staging from https://dist.apache.org/repos/dist/dev/felix instead -of http://repository.apache.org/content/repositories. - -To rebuild the DM binaries from the source, jdk8 must be used, and you can refer to: - -https://github.com/apache/felix-dev/blob/master/dependencymanager/release/resources/src/README.src - -Please cast your votes to approve this release: - -[ ] +1 Approve the release -[ ] -1 Veto the release (please provide specific comments) - -This vote will be open for 72 hours. -<<< - -Promoting the release: -===================== - -Move the artifacts from the development area to the final release location at -https://dist.apache.org/repos/dist/release/felix by invoking the following target: - -$ ./gradlew promoteToRelease --no-daemon - -Cancelling the release -====================== - -$ ./gradlew deleteFromStaging --no-daemon - - -[1] http://www.apache.org/dev/release.html -[2] http://www.apache.org/dist/felix/KEYS diff --git a/dependencymanager/release/bnd.bnd b/dependencymanager/release/bnd.bnd deleted file mode 100644 index 8cd826073c..0000000000 --- a/dependencymanager/release/bnd.bnd +++ /dev/null @@ -1,27 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# --nobundles: --dependson \ - org.apache.felix.dependencymanager,\ - org.apache.felix.dependencymanager.shell,\ - org.apache.felix.dependencymanager.annotation,\ - org.apache.felix.dependencymanager.runtime - - -# we do not release this project in binary distribution. --releaserepo: --baseline: diff --git a/dependencymanager/release/build.gradle b/dependencymanager/release/build.gradle deleted file mode 100644 index abf3c108f4..0000000000 --- a/dependencymanager/release/build.gradle +++ /dev/null @@ -1,297 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * Gradle script used to perform DM releases (really similar to Apache ACE build.xml) - */ -import aQute.bnd.build.Workspace - -buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath bnd_plugin - } -} - -// Our release number, which has to be monotonically incremented each time we make a new release. -ext.dmRelease = "r17" - -// Our Apache svn Staging repo -ext.svnStagingPath = "https://dist.apache.org/repos/dist/dev/felix" - -// Our Apache svn Release repo -ext.svnReleasePath = "https://dist.apache.org/repos/dist/release/felix" - -apply plugin: 'java' -apply from: file("rat.gradle") - -// Configure RAT plugin to ignore some files -rat { - excludes = [ - 'rat-report.xml', - '**/.git/**', - '**/.gradle/**', - 'build/**', - '**/.keepme', - '**/.project', - '**/.settings/**', - '**/*.iml', - '**/*.iws', - '**/*.ipr', - '**/.classpath', - 'cnf/**', - 'gradle/wrapper/**', - 'release/**', - 'gradlew', - 'README', - '**/DEPENDENCIES', - '**/README', - '**/.gitignore', - '**/generated/**', - 'doc/**', - '**/packageinfo', - '**/*.txt', - 'docs/**', - '.metadata/**' - ] -} - -// Setup the workspace -Workspace workspace -workspace = Workspace.getWorkspace(rootProject.projectDir) - -task makeStaging { - doLast { - description = 'Packages the source and binary distributions.' - - // Package source distributions. - logger.lifecycle(" Packaging source distributions.") - def topdir="org.apache.felix.dependencymanager-" + dmRelease - ant.zip(destfile: "staging/"+topdir+'-src.zip') { - zipfileset(dir: '../cnf', prefix: topdir+"-src/cnf", includes: ".project,.classpath,src/**,*.bnd,*.mvn,ext/**") - zipfileset(dir: '..', prefix: topdir+"-src", includes: '*.gradle,*.properties') - zipfileset(dir: 'resources/src', prefix: topdir+"-src", includes: '*') - ant.zipfileset(dir: '..', prefix: topdir+"-src", includes: 'gradlew') - ant.zipfileset(dir: '..', prefix: topdir+"-src", includes: 'changelog.txt') - ant.zipfileset(dir: '../.gradle-wrapper', prefix: topdir+"-src/.gradle-wrapper", includes: 'gradle-wrapper.properties') - new File('.').eachFile { - if(new File(it, 'bnd.bnd').exists()) { - def bndProject = workspace.getProject(it.name) - if (! bndProject.isNoBundles() && ! bndProject.getName().endsWith(".benchmark")) { - zipfileset(dir: "../${bndProject.name}", prefix: topdir+"-src/${bndProject.name}", - includes: "*.gradle,.project,.classpath,.settings/**,src/**,test/**,*.bnd,*.bndrun,run-*/conf/**,resources/**,README*,changelog.txt") - } - } - } - } - - // Package binaries as a simple collection of bundles. We use same license files as for src distrib. - logger.lifecycle(" Packaging binary distribution.") - - // First, get list of latest released bundles available from our Release repository - def released = [] - def releaseRepo = workspace.getRepository("Release") - def bundles=releaseRepo.list(null) - bundles.each { - def sortedVersions = releaseRepo.versions(it) - def latestVersion = sortedVersions.last() - def latestBundle = releaseRepo.get(it, latestVersion, null) - released << latestBundle - } - - // Before adding all latest released bundles in the binary distribution, check if they contain proper license files. - logger.lifecycle(" Checking META-INF mandatory files.") - released.each { jarfile -> - if (jarfile.isFile()) { - new ByteArrayOutputStream().withStream { os -> - def result = exec { - executable = 'jar' - args = ['tf', jarfile, "META-INF"] - standardOutput = os - } - def files = os.toString().split("\n") - def mandatory = ["META-INF/LICENSE", "META-INF/NOTICE", "META-INF/DEPENDENCIES", "META-INF/changelog.txt"] - mandatory.each { resource -> - if (! files.contains(resource)) { - throw new GradleException("Missing mandatory license files in " + jarfile) - } - } - } - } - } - - // Now, add all the latest released bundles in the binary distribution - ant.zip(destfile: "staging/"+topdir+"-bin.zip") { - // include workspace changelog - zipfileset(dir: '..', prefix: topdir+"-bin/", includes: "changelog.txt") - - // simply include all released bundle. - released.each { - file=it - ant.mappedresources() { - ant.filelist(files: file) - ant.chainedmapper() { - ant.flattenmapper() - ant.globmapper(from: '*', to: topdir+'-bin/*') - } - } - } - ant.mappedresources() { - ant.fileset(dir: 'resources/bin', includes: '*') - ant.chainedmapper() { - ant.flattenmapper() - ant.globmapper(from: '*', to: topdir+'-bin/*') - } - } - } - } -} - - - - -// Sign staging directory (you must use "--no-daemon" gradle option) -task signStaging { - doLast { - ant.input(message: 'Enter PGP password:', addproperty: 'pass') - - description = 'Signs the local staging distribution.' - fileTree("staging").visit { FileVisitDetails details -> - logger.lifecycle(" Signing " + details.file.path) - ant.exec(executable: 'gpg', dir: 'staging') { - ant.arg(line: '--batch') - ant.arg(line: '--passphrase') - ant.arg(line: ant.properties.pass) - ant.arg(line: '--armor') - ant.arg(line: '--output') - ant.arg(line: details.file.name + ".asc") - ant.arg(line: "--detach-sig") - ant.arg(line: details.file.name) - } - - ant.exec(executable: 'gpg', dir: 'staging', output: "staging/" + details.file.name + ".sha1") { - ant.arg(line: '--print-md') - ant.arg(line: 'SHA1') - ant.arg(line: details.file.name) - } - - ant.exec(executable: 'gpg', dir: 'staging', output: "staging/" + details.file.name + ".sha512") { - ant.arg(line: '--print-md') - ant.arg(line: 'SHA512') - ant.arg(line: details.file.name) - } - } - } -} - - - -// Moves the source and binary distributions to staging. -task commitToStaging { - doLast { - description = 'Commits the local staging to the Apache svn staging repository.' - ant.input(message: 'Enter SVN user:', addproperty: 'user') - ant.input(message: 'Enter SVN password:', addproperty: 'password') - def user = ant.properties.user - def password = ant.properties.password - - getProject().exec { - commandLine 'svn', - 'import', 'staging', svnStagingPath + "/org.apache.felix.dependencymanager-" + dmRelease + "/", - '-m', "Staging Apache Felix Dependency Manager release " + dmRelease + ".", "--username", user, "--password", password - } - } -} - -// Promotes the staged distributions to release -task promoteToRelease { - doLast { - description = 'Moves the staging repository to the Apache release repository.' - ant.input(message: 'Enter SVN user:', addproperty: 'user') - ant.input(message: 'Enter SVN password:', addproperty: 'password') - def user = ant.properties.user - def password = ant.properties.password - - // Move all artifacts from the staging repo to the release repo - new ByteArrayOutputStream().withStream { os -> - def result = exec { - executable = 'svn' - args = ['list', svnStagingPath+"/org.apache.felix.dependencymanager-" + dmRelease] - standardOutput = os - } - def outputAsString = os.toString() - - outputAsString.split("\n").each { artifact -> - logger.lifecycle(" Moving " + artifact + " to release repository ...") - getProject().exec { - commandLine 'svn', - 'move', svnStagingPath+"/org.apache.felix.dependencymanager-" + dmRelease + "/" + artifact , - svnReleasePath, '-m', "Releasing Apache Felix Dependency Manager release " + dmRelease + ".", - "--username", user, "--password", password - } - } - } - - // And remove the toplevel release path from the staging repo - logger.lifecycle(" Removing org.apache.felix.dependencymanager-" + dmRelease + " from staging ...") - getProject().exec { - commandLine 'svn', - 'rm', svnStagingPath+"/org.apache.felix.dependencymanager-" + dmRelease, "-m", - "Releasing Apache Felix Dependency Manager release " + dmRelease + ".", - "--username", user, "--password", password - } - } -} - -// Removes the staged distributions from staging -task deleteFromStaging { - doLast { - description = 'Cancels the staged distribution from the Apache staging repository.' - ant.input(message: 'Enter SVN user:', addproperty: 'user') - ant.input(message: 'Enter SVN password:', addproperty: 'password') - def user = ant.properties.user - def password = ant.properties.password - - getProject().exec { - commandLine 'svn', - 'delete', svnStagingPath+"/org.apache.felix.dependencymanager-" + dmRelease + "/", - "-m", "Removing Apache Felix Dependency Manager release " + dmRelease + " from staging.", - "--username", user, "--password", password - } - } -} - -// Clean staging directory - -clean.doLast { - new File("release/staging").deleteDir() - new File("rat-report.xml").delete() -} - -// Only clean the staging directory -task cleanStaging { - doLast { - description = 'Clean the local staging directory.' - new File("release/staging").deleteDir() - new File("release/staging-copy").deleteDir() - } -} diff --git a/dependencymanager/release/check_staged_release.sh b/dependencymanager/release/check_staged_release.sh deleted file mode 100755 index 042c383d54..0000000000 --- a/dependencymanager/release/check_staged_release.sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# This script verifies the signatures and checksums of a release. -# -# This script can be used to check the signatures and checksums of staged -# Apache Felix Dependency Manager release using gpg. -# Usage: -# -# check_staged_dependencymanager.sh [] -# -# Where: -# represents the staged release version, e.g., 2.0.0; -# represents the location where the release artifacts -# should be stored, defaults to /tmp/felix-staging if -# omitted. - - -version=${1} -tmpDir=${2:-/tmp/felix-staging} - -if [ ! -d "${tmpDir}" ]; then - mkdir "${tmpDir}" -fi - -if [ -z "${version}" -o ! -d "${tmpDir}" ]; then - echo "Usage: check_staged_dependencymanager.sh [temp-directory]" - exit -fi - -checkSig() { - sigFile="$1.asc" - if [ ! -f $sigFile ]; then - echo "$sigFile is missing!!!" - exit 1 - fi - - gpg --verify $sigFile 2>/dev/null >/dev/null - if [ "$?" = "0" ]; then echo "OK"; else echo "BAD!!!"; fi -} - -checkSum() { - archive=$1 - sumFile=$2 - alg=$3 - if [ ! -f $sumFile ]; then - echo "$sumFile is missing!!!" - exit 1 - fi - - orig=`cat $sumFile | sed 's/.*: *//' | tr -d ' \t\n\r'` - actual=`gpg --print-md $alg $archive | sed 's/.*: *//' | tr -d ' \t\n\r'` - if [ "$orig" = "$actual" ]; then echo "OK"; else echo "BAD!!!"; fi -} - -KEYS_URL="http://www.apache.org/dist/felix/KEYS" -REL_URL="https://dist.apache.org/repos/dist/dev/felix/org.apache.felix.dependencymanager-${version}/" -PWD=`pwd` - -echo "################################################################################" -echo " IMPORTING KEYS " -echo "################################################################################" -if [ ! -e "${tmpDir}/KEYS" ]; then - wget --no-check-certificate -P "${tmpDir}" $KEYS_URL -fi -gpg --import "${tmpDir}/KEYS" - -if [ ! -e "${tmpDir}/org.apache.felix.dependencymanager-${version}" ] -then - echo "################################################################################" - echo " DOWNLOAD STAGED REPOSITORY " - echo "################################################################################" - - wget \ - -e "robots=off" --wait 1 -nv -r -np "--reject=html,html.tmp,txt" "--follow-tags=" \ - -P "${tmpDir}/org.apache.felix.dependencymanager-${version}" -nH "--cut-dirs=5" \ - $REL_URL -else - echo "################################################################################" - echo " USING EXISTING STAGED REPOSITORY " - echo "################################################################################" - echo "${tmpDir}/org.apache.felix.dependencymanager-${version}" -fi - -echo "################################################################################" -echo " CHECK SIGNATURES AND DIGESTS " -echo "################################################################################" - -cd ${tmpDir}/org.apache.felix.dependencymanager-${version} -for f in `find . -type f | grep -v '\.\(asc\|sha1\|sha512\|md5\)$'`; do - echo "checking $f" - - echo -e " ASC: \c" - checkSig $f - echo -e " SHA1: \c" - checkSum $f "$f.sha1" SHA1 - echo -e " SHA512: \c" - checkSum $f "$f.sha512" SHA512 - echo "" -done - -cd $PWD -echo "################################################################################" - diff --git a/dependencymanager/release/rat.gradle b/dependencymanager/release/rat.gradle deleted file mode 100644 index 0a572f2baf..0000000000 --- a/dependencymanager/release/rat.gradle +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.Task -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Internal - -apply plugin: RatPlugin - -class RatTask extends DefaultTask { - @Input - List excludes - - // Directory which is checked, and the file the xml report is written to. - @Internal - File baseDir - - @Internal - File xmlReport - - def generateXmlReport() { - xmlReport.parentFile.mkdirs() - def ratClasspath = project.configurations.rat.asPath - def ratExcludes = excludes - def checkedDir = baseDir - project.ant.taskdef(resource: 'org/apache/rat/anttasks/antlib.xml', classpath: ratClasspath) - project.ant.report(format: 'xml', reportFile: xmlReport.absolutePath) { - fileset(dir: checkedDir.absolutePath) { - patternset { - ratExcludes.each { - exclude(name: it) - } - } - } - } - } - - def printUnknownFiles() { - def ratXml = new groovy.xml.XmlParser().parse(xmlReport) - ratXml.resource.each { resource -> - if (resource.'license-approval'.@name[0] == "false") { - println('Unknown license: ' + resource.@name) - } - } - } - - @TaskAction - def rat() { - generateXmlReport() - printUnknownFiles() - } -} - -class RatPlugin implements Plugin { - void apply(Project project) { - configureDependencies(project) - project.plugins.apply(JavaBasePlugin); - Task ratTask = project.task("rat", - type: RatTask, - group: 'Build', - description: 'Runs Apache Rat checks.') { - baseDir = project.rootProject.projectDir - xmlReport = new File(project.rootProject.projectDir, 'build/rat-report.xml') - } - project.tasks[JavaBasePlugin.CHECK_TASK_NAME].dependsOn ratTask - } - - void configureDependencies(final Project project) { - project.configurations { - rat - } - project.repositories { - mavenCentral() - } - project.dependencies { - rat 'org.apache.rat:apache-rat-tasks:0.16.1' - } - } -} diff --git a/dependencymanager/release/resources/bin/LICENSE b/dependencymanager/release/resources/bin/LICENSE deleted file mode 100644 index 6b0b1270ff..0000000000 --- a/dependencymanager/release/resources/bin/LICENSE +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/dependencymanager/release/resources/bin/NOTICE b/dependencymanager/release/resources/bin/NOTICE deleted file mode 100644 index bdcdd85087..0000000000 --- a/dependencymanager/release/resources/bin/NOTICE +++ /dev/null @@ -1,11 +0,0 @@ -Apache Felix Dependency Manager -Copyright 2011-2021 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). -Licensed under the Apache License 2.0. - -This product includes software developed at -The OSGi Alliance (http://www.osgi.org/). -Copyright (c) OSGi Alliance (2000, 2015). -Licensed under the Apache License 2.0. diff --git a/dependencymanager/release/resources/bin/README.bin b/dependencymanager/release/resources/bin/README.bin deleted file mode 100644 index 9196034dda..0000000000 --- a/dependencymanager/release/resources/bin/README.bin +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -Welcome to Apache Felix Dependency Manager -========================================== - -Apache Felix Dependency Manager is a versatile java API, allowing to declaratively -register, acquire, and manage dynamic OSGi services. - -Getting Started -=============== - -To start using Apache Felix Dependency Manager, please go to our website and read the -various guides for users: - -- For a quick jump start (using either maven, gradle, the DM api, the DM annotations, or the new DM lambda-api), -then please go to: - - http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager/tutorials/sample-code.html - -There are three ways to use Dependency Manager: you can use the original java API, the new lambda API, or the -DM annotations. - -- For the Dependency Manager java API documentation, please go to the general Getting-Started documentation here: - - http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html - -- For new Dependency Manager Lambda API, you can go to: - -http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager/guides/dm-lambda.html - -- And for Dependency Manager Annotations API, you can refer directly to: - - http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.html - -Many thanks for using Apache Felix Dependency Manager. - -The Felix Team - diff --git a/dependencymanager/release/resources/src/LICENSE b/dependencymanager/release/resources/src/LICENSE deleted file mode 100644 index d645695673..0000000000 --- a/dependencymanager/release/resources/src/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/dependencymanager/release/resources/src/NOTICE b/dependencymanager/release/resources/src/NOTICE deleted file mode 100644 index bdcdd85087..0000000000 --- a/dependencymanager/release/resources/src/NOTICE +++ /dev/null @@ -1,11 +0,0 @@ -Apache Felix Dependency Manager -Copyright 2011-2021 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). -Licensed under the Apache License 2.0. - -This product includes software developed at -The OSGi Alliance (http://www.osgi.org/). -Copyright (c) OSGi Alliance (2000, 2015). -Licensed under the Apache License 2.0. diff --git a/dependencymanager/release/resources/src/README.src b/dependencymanager/release/resources/src/README.src deleted file mode 100644 index 9fbae396e3..0000000000 --- a/dependencymanager/release/resources/src/README.src +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -Welcome to Apache Felix Dependency Manager -========================================== - -Apache Felix Dependency Manager is a versatile java API, allowing to declaratively -register, acquire, and manage dynamic OSGi services. - -In addition to the original DM API, a new DM-lambda library also allows to define -OSGI components using a fluent, concise, and more type-safe API, based on java8 lambdas. - -Building and testing Apache Felix Dependency Manager -==================================================== - -** Compilation Using gradle: - -- If necessary, configure your https proxy settings, for example: - - export GRADLE_OPTS="-Dhttps.proxyHost=www.somehost.org -Dhttps.proxyPort=8080" - export http_proxy=www.somehost.org:8080 - export https_proxy=www.somehost.org:8080 - -- Install a recent java8 JDK (the software has been built and tested using java version 1.8.0_74) - -- Compile Dependendency Manager annotations bndtools plugin: - -$ ./gradlew --no-daemon org.apache.felix.dependencymanager.annotation:jar - -- Compile all other bundles: - -$ ./gradlew --no-daemon jar - -- run junit tests: - -$ ./gradlew --no-daemon test - -- run integration tests: - -$ ./gradlew --no-daemon check - -** Compilation Using Eclipse: - -- Install latest Eclipse Mars, and configure a JRE for java8: - -* go to Windows -> Preferences -> Java -> Installed JREs -* Then add a java8 JRE of your choice. - -- Install BndTools 3.5.0 (or latest) - -- Open BndTools perspective - -- Import Dependency Manager into Eclipse, and compile everything - -- if it's the first time you import the project into eclipse, it may happen that some modules that requires the -Dependency Manager Annotations bnd plugin don't compile: It's a know issue. To work around, restart eclipse and -rebuild every modules. - -- Click on org.apache.felix.dependencymanager project and run it as "JUnit test". - -- Click on org.apache.felix.dependencymanager.shell and run it as "JUnit test" - -- Click on org.apache.felix.dependencymanager.itest and run it as "Bnd OSGi Test Launcer (Junit)". - -- Click on org.apache.felix.dependencymanager.runtime.itest and run it as ""Bnd OSGi Test Launcer (Junit)". - -Getting Started -=============== - -To start using Apache Felix Dependency Manager, please go to our website and read the -various guides for users: - -- For a quick jump start (using either maven, gradle, the DM api, the DM annotations, or the new DM lambda-api), -then please go to: - - http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager/tutorials/sample-code.html - -There are three ways to use Dependency Manager: you can use the original java API, the new lambda API, or the -DM annotations. - -- For the Dependency Manager java API documentation, please go to the general Getting-Started documentation here: - - http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html - -- For new Dependency Manager Lambda API, you can go to: - -http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager/guides/dm-lambda.html - -- And for Dependency Manager Annotations API, you can refer directly to: - - http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager/reference/dm-annotations.html - -Many thanks for using Apache Felix Dependency Manager. - -The Felix Team diff --git a/dependencymanager/release/src/.gitignore b/dependencymanager/release/src/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/release/test/.gitignore b/dependencymanager/release/test/.gitignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dependencymanager/settings.gradle b/dependencymanager/settings.gradle deleted file mode 100644 index 10960b29ae..0000000000 --- a/dependencymanager/settings.gradle +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -buildscript { - repositories { mavenCentral() } - dependencies { classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:${bnd_version}" } -} - -apply plugin: 'biz.aQute.bnd.workspace'