Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Felix Resolver Tests #548

Merged
merged 2 commits into from
Apr 22, 2024
Merged

Add Felix Resolver Tests #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e74496
Import test classes from felix-dev
laeubi Mar 3, 2024
f8285d0
Enable Felix Tests in the Build
laeubi Mar 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*/*/bin/
bin_test
/bundles/archived/*/bin/
.DS_Store

Expand All @@ -8,4 +9,4 @@ target/
.polyglot.*
.META-INF_*
pom.tycho
.tycho-consumer-pom.xml
.tycho-consumer-pom.xml
7 changes: 7 additions & 0 deletions bundles/org.eclipse.osgi/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,12 @@
</classpathentry>
<classpathentry kind="src" path="supplement/src"/>
<classpathentry kind="src" path="container/src"/>
<classpathentry kind="src" output="bin_test" path="felix/src_test">
<attributes>
<attribute name="test" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions bundles/org.eclipse.osgi/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ output.. = bin/
javacWarnings..=-raw,unchecked,hiding,unused,warningToken
jars.extra.classpath = osgi/j9stubs.jar
jre.compilation.profile = JavaSE-1.8
additional.bundles = org.mockito.mockito-core
59 changes: 59 additions & 0 deletions bundles/org.eclipse.osgi/felix/src_test/felix-4914.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"repository": [
{
"capabilities": [
"osgi.identity; osgi.identity=root; type=karaf.subsystem; version:Version=0.0.0"
],
"requirements": [
"osgi.identity; osgi.identity=org.apache.activemq.activemq-blueprint; type=osgi.fragment",
"osgi.identity; osgi.identity=org.apache.aries.blueprint.core.compatibility; type=osgi.fragment",
"osgi.identity; osgi.identity=org.apache.aries.blueprint.core; type=osgi.bundle"
]
},
{
"capabilities": [
"osgi.identity; osgi.identity=org.apache.activemq.activemq-blueprint; type=osgi.fragment; version:Version=5.11.1"
],
"requirements": [
"osgi.wiring.host; osgi.wiring.host=org.apache.activemq.activemq-osgi; filter:=\"(osgi.wiring.host=org.apache.activemq.activemq-osgi)\"",
"osgi.wiring.package; filter:=\"(osgi.wiring.package=org.apache.aries.blueprint)\"",
"osgi.wiring.package; filter:=\"(osgi.wiring.package=org.apache.xbean.blueprint.context.impl)\""
]
},
{
"capabilities": [
"osgi.identity; osgi.identity=org.apache.activemq.activemq-osgi; type=osgi.bundle; version:Version=5.11.1",
"osgi.wiring.host; osgi.wiring.host=org.apache.activemq.activemq-osgi"
],
"requirements": [
"osgi.wiring.package; filter:=\"(osgi.wiring.package=org.osgi.service.blueprint)\""
]
},
{
"capabilities": [
"osgi.identity; osgi.identity=org.apache.xbean.blueprint; type=osgi.bundle; version:Version=3.18.0",
"osgi.wiring.package; osgi.wiring.package=org.apache.xbean.blueprint.context.impl; uses:=\"org.apache.aries.blueprint\""
],
"requirements": [
"osgi.wiring.package; filter:=\"(osgi.wiring.package=org.apache.aries.blueprint)\""
]
},
{
"capabilities": [
"osgi.identity; osgi.identity=org.apache.aries.blueprint.core.compatibility; type=osgi.fragment; version:Version=1.0.0"
],
"requirements": [
"osgi.wiring.host; osgi.wiring.host=org.apache.aries.blueprint.core; filter:=\"(osgi.wiring.host=org.apache.aries.blueprint.core)\""
]
},
{
"capabilities": [
"osgi.identity; osgi.identity=org.apache.aries.blueprint.core; type=osgi.bundle; version:Version=1.4.3",
"osgi.wiring.host; osgi.wiring.host=org.apache.aries.blueprint.core",
"osgi.wiring.package; osgi.wiring.package=org.apache.aries.blueprint; uses:=\"org.apache.aries.blueprint.services,org.osgi.service.blueprint.reflect\"",
"osgi.wiring.package; osgi.wiring.package=org.osgi.service.blueprint"
]
}
],
"exception": "org.osgi.service.resolver.ResolutionException: Uses constraint violation. Unable to resolve resource org.apache.activemq.activemq-blueprint [org.apache.activemq.activemq-blueprint/5.11.1] because it is exposed to package 'org.apache.aries.blueprint' from resources org.apache.aries.blueprint.core [org.apache.aries.blueprint.core/1.4.3] and org.apache.aries.blueprint.core [org.apache.aries.blueprint.core/1.4.3] via two dependency chains.\n\nChain 1:\n org.apache.activemq.activemq-blueprint [org.apache.activemq.activemq-blueprint/5.11.1]\n import: (&(osgi.wiring.package=org.apache.aries.blueprint)(version>=1.0.0)(!(version>=2.0.0)))\n |\n export: osgi.wiring.package: org.apache.aries.blueprint\n org.apache.aries.blueprint.core [org.apache.aries.blueprint.core/1.4.3]\n\nChain 2:\n org.apache.activemq.activemq-blueprint [org.apache.activemq.activemq-blueprint/5.11.1]\n import: (&(osgi.wiring.package=org.apache.xbean.blueprint.context.impl)(version>=3.13.0)(!(version>=4.0.0)))\n |\n export: osgi.wiring.package=org.apache.xbean.blueprint.context.impl; uses:=org.apache.aries.blueprint\n org.apache.xbean.blueprint [org.apache.xbean.blueprint/3.18.0]\n import: (&(osgi.wiring.package=org.apache.aries.blueprint)(version>=1.0.0)(!(version>=2.0.0)))\n |\n export: osgi.wiring.package: org.apache.aries.blueprint\n org.apache.aries.blueprint.core [org.apache.aries.blueprint.core/1.4.3]"
}
Loading
Loading