diff --git a/eventadmin/bridge.configuration/pom.xml b/eventadmin/bridge.configuration/pom.xml
index 094213ee4f..6ae2346009 100644
--- a/eventadmin/bridge.configuration/pom.xml
+++ b/eventadmin/bridge.configuration/pom.xml
@@ -20,7 +20,7 @@
org.apache.felix
felix-parent
- 4
+ 9
../../pom/pom.xml
4.0.0
@@ -39,14 +39,14 @@
- 6
+ 7
org.osgi
- org.osgi.core
- 5.0.0
+ osgi.core
+ 7.0.0
provided
@@ -68,7 +68,7 @@
org.apache.felix
maven-bundle-plugin
- 3.2.0
+ 6.0.0
true
diff --git a/eventadmin/bridge.upnp/pom.xml b/eventadmin/bridge.upnp/pom.xml
index 5f3f8d8542..7ec4e343f0 100644
--- a/eventadmin/bridge.upnp/pom.xml
+++ b/eventadmin/bridge.upnp/pom.xml
@@ -19,8 +19,8 @@
org.apache.felix
- felix
- 1.0.4
+ felix-parent
+ 9
../../pom/pom.xml
4.0.0
diff --git a/eventadmin/bridge.useradmin/pom.xml b/eventadmin/bridge.useradmin/pom.xml
index 6d2446fb45..1ba1cd0c61 100644
--- a/eventadmin/bridge.useradmin/pom.xml
+++ b/eventadmin/bridge.useradmin/pom.xml
@@ -19,8 +19,8 @@
org.apache.felix
- felix
- 1.0.4
+ felix-parent
+ 9
../../pom/pom.xml
4.0.0
diff --git a/eventadmin/bridge.wireadmin/pom.xml b/eventadmin/bridge.wireadmin/pom.xml
index 9e43b04015..f5677a5cf5 100644
--- a/eventadmin/bridge.wireadmin/pom.xml
+++ b/eventadmin/bridge.wireadmin/pom.xml
@@ -19,8 +19,8 @@
org.apache.felix
- felix
- 1.0.4
+ felix-parent
+ 9
../../pom/pom.xml
4.0.0
diff --git a/eventadmin/impl/pom.xml b/eventadmin/impl/pom.xml
index d90614cf80..e4be41c859 100644
--- a/eventadmin/impl/pom.xml
+++ b/eventadmin/impl/pom.xml
@@ -20,7 +20,7 @@
org.apache.felix
felix-parent
- 7
+ 9
../../pom/pom.xml
4.0.0
@@ -53,7 +53,7 @@
org.osgi
osgi.core
- 6.0.0
+ 7.0.0
provided
@@ -71,7 +71,7 @@
org.osgi
org.osgi.service.log
- 1.3.0
+ 1.4.0
provided
@@ -96,38 +96,38 @@
org.slf4j
slf4j-simple
- 1.7.5
+ 1.7.36
test
org.ops4j.pax.exam
pax-exam-container-forked
- 4.13.1
+ 4.13.4
test
org.ops4j.pax.exam
pax-exam-junit4
- 4.13.1
+ 4.13.4
test
org.ops4j.pax.exam
pax-exam-link-mvn
- 4.13.1
+ 4.13.4
test
org.ops4j.pax.url
pax-url-aether
- 2.6.2
+ 2.6.14
test
org.ops4j.pax.url
pax-url-wrap
- 2.6.2
+ 2.6.14
test
@@ -139,7 +139,7 @@
org.apache.felix
org.apache.felix.framework
- 6.0.3
+ 7.0.5
test
@@ -153,7 +153,7 @@
org.apache.felix
maven-bundle-plugin
- 4.2.1
+ 6.0.0
true
@@ -180,10 +180,10 @@
-->
org.osgi.service.metatype;version="[1.1,2)";resolution:=optional,
-
- org.osgi.service.log;version="[1.3,2)";resolution:=optional,
+
+ org.osgi.service.log;version="[1.3,2)";resolution:=optional,
*
diff --git a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
index 25b21fc275..aa31dd3d93 100644
--- a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
+++ b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
@@ -25,11 +25,6 @@
import java.util.Hashtable;
import java.util.StringTokenizer;
-import org.apache.felix.eventadmin.impl.adapter.AbstractAdapter;
-import org.apache.felix.eventadmin.impl.adapter.BundleEventAdapter;
-import org.apache.felix.eventadmin.impl.adapter.FrameworkEventAdapter;
-import org.apache.felix.eventadmin.impl.adapter.LogEventAdapter;
-import org.apache.felix.eventadmin.impl.adapter.ServiceEventAdapter;
import org.apache.felix.eventadmin.impl.handler.EventAdminImpl;
import org.apache.felix.eventadmin.impl.security.SecureEventAdminFactory;
import org.apache.felix.eventadmin.impl.tasks.DefaultThreadPool;
@@ -172,9 +167,6 @@ public class Configuration
// The registration of the mbean
private volatile ServiceRegistration