diff --git a/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF index 1588e70ad0..27c03663f7 100644 --- a/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Declarative Services Tests Bundle-Vendor: Eclipse.org - Equinox Bundle-Category: test Bundle-SymbolicName: org.eclipse.equinox.ds.tests -Bundle-Version: 1.6.100.qualifier +Bundle-Version: 1.6.200.qualifier Bundle-Activator: org.eclipse.equinox.ds.tests.DSTestsActivator Bundle-ActivationPolicy: lazy Require-Bundle: org.junit diff --git a/bundles/org.eclipse.equinox.ds.tests/pom.xml b/bundles/org.eclipse.equinox.ds.tests/pom.xml index edfa768b4d..4e86bc3906 100644 --- a/bundles/org.eclipse.equinox.ds.tests/pom.xml +++ b/bundles/org.eclipse.equinox.ds.tests/pom.xml @@ -19,7 +19,7 @@ org.eclipse.equinox org.eclipse.equinox.ds.tests - 1.6.100-SNAPSHOT + 1.6.200-SNAPSHOT eclipse-test-plugin org.eclipse.equinox.ds.tests.AllTests diff --git a/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/DSTestsActivator.java b/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/DSTestsActivator.java index 54e9376741..2a907b0053 100644 --- a/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/DSTestsActivator.java +++ b/bundles/org.eclipse.equinox.ds.tests/src/org/eclipse/equinox/ds/tests/DSTestsActivator.java @@ -27,10 +27,12 @@ public class DSTestsActivator implements BundleActivator { public DSTestsActivator() { instance = this; } + @Override public void start(BundleContext context) throws Exception { this.context = context; } + @Override public void stop(BundleContext context) throws Exception { this.context = null; } @@ -43,7 +45,6 @@ public static void activateSCR() { activateBundle("org.apache.felix.scr"); activateBundle("org.eclipse.equinox.cm"); activateBundle("org.eclipse.equinox.log"); - activateBundle("org.eclipse.equinox.util"); } private static void activateBundle(String symbolicName) { diff --git a/bundles/org.eclipse.equinox.http.registry/pom.xml b/bundles/org.eclipse.equinox.http.registry/pom.xml index 1523d0111c..1b3aa767e5 100644 --- a/bundles/org.eclipse.equinox.http.registry/pom.xml +++ b/bundles/org.eclipse.equinox.http.registry/pom.xml @@ -21,25 +21,4 @@ org.eclipse.equinox.http.registry 1.3.100-SNAPSHOT eclipse-plugin - - - - - org.eclipse.tycho - target-platform-configuration - - - - - osgi-bundle - org.eclipse.equinox.servletbridge.extensionbundle - - - - - - - diff --git a/bundles/org.eclipse.equinox.http.servletbridge/pom.xml b/bundles/org.eclipse.equinox.http.servletbridge/pom.xml index 6e0465811f..5d5b71baed 100644 --- a/bundles/org.eclipse.equinox.http.servletbridge/pom.xml +++ b/bundles/org.eclipse.equinox.http.servletbridge/pom.xml @@ -21,25 +21,4 @@ org.eclipse.equinox.http.servletbridge 1.2.100-SNAPSHOT eclipse-plugin - - - - - org.eclipse.tycho - target-platform-configuration - - - - - osgi-bundle - org.eclipse.equinox.servletbridge.extensionbundle - - - - - - -