You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2016/06/27 10:23:56 UTC
karaf git commit: Fix itests by adding Bundle-ManifestVersion:2
Repository: karaf
Updated Branches:
refs/heads/master b83442407 -> 45d7f6d3e
Fix itests by adding Bundle-ManifestVersion:2
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/45d7f6d3
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/45d7f6d3
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/45d7f6d3
Branch: refs/heads/master
Commit: 45d7f6d3e8893b7f0531cdf3cb848eadfca864bc
Parents: b834424
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Jun 27 12:23:48 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Jun 27 12:23:48 2016 +0200
----------------------------------------------------------------------
.../apache/karaf/itests/ImportServiceTest.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/45d7f6d3/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java b/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java
index 734edd4..0287c98 100644
--- a/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/ImportServiceTest.java
@@ -29,6 +29,7 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
@@ -37,21 +38,22 @@ public class ImportServiceTest extends KarafTestSupport {
private static final String BUNDLE2_NAME = "testbundle.require.service";
private static final String BUNDLE1_NAME = "testbundle.import.service";
+ @SuppressWarnings("deprecation")
@Configuration
public Option[] config() {
List<Option> options = new ArrayList<Option>(Arrays.asList(super.config()));
InputStream testBundleImportService = bundle()
- .set("Import-Service", "FooService")
- .set("Bundle-SymbolicName", BUNDLE1_NAME)
- .set("Bundle-Version", "1.0.0")
- .set("Bundle-ManifestVersion", "2")
+ .set(Constants.IMPORT_SERVICE, "FooService")
+ .set(Constants.BUNDLE_SYMBOLICNAME, BUNDLE1_NAME)
+ .set(Constants.BUNDLE_VERSION, "1.0.0")
+ .set(Constants.BUNDLE_MANIFESTVERSION, "2")
.build();
options.add(CoreOptions.streamBundle(testBundleImportService));
InputStream testBundleRequireService = bundle()
- .set("Require-Capability", "osgi.service;effective:=active;filter:=\"(objectClass=FooService)\"")
- .set("Bundle-SymbolicName", BUNDLE2_NAME)
- .set("Bundle-Version", "1.0.0")
- .set("Bundle-ManifestVersion", "2")
+ .set(Constants.REQUIRE_CAPABILITY, "osgi.service;effective:=active;filter:=\"(objectClass=FooService)\"")
+ .set(Constants.BUNDLE_SYMBOLICNAME, BUNDLE2_NAME)
+ .set(Constants.BUNDLE_VERSION, "1.0.0")
+ .set(Constants.BUNDLE_MANIFESTVERSION, "2")
.build();
options.add(CoreOptions.streamBundle(testBundleRequireService));
return options.toArray(new Option[] {});