2 files changed, 10 insertions, 1 deletions
diff --git a/test/dependency-rewrite-addon/src/main/java/com/vaadin/test/dependencyrewriteaddon/RewriteJQueryFilter.java b/test/dependency-rewrite-addon/src/main/java/com/vaadin/test/dependencyrewriteaddon/RewriteJQueryFilter.java
index 415bb9b093..3a317da46c 100644
--- a/test/dependency-rewrite-addon/src/main/java/com/vaadin/test/dependencyrewriteaddon/RewriteJQueryFilter.java
+++ b/test/dependency-rewrite-addon/src/main/java/com/vaadin/test/dependencyrewriteaddon/RewriteJQueryFilter.java
@@ -5,10 +5,13 @@ import java.util.List;
 import java.util.Locale;
 
 import com.vaadin.server.DependencyFilter;
+import com.vaadin.server.ServiceInitEvent;
+import com.vaadin.server.VaadinServiceInitListener;
 import com.vaadin.ui.Dependency;
 import com.vaadin.ui.Dependency.Type;
 
-public class RewriteJQueryFilter implements DependencyFilter {
+public class RewriteJQueryFilter
+        implements DependencyFilter, VaadinServiceInitListener {
 
     @Override
     public List<Dependency> filter(List<Dependency> dependencies,
@@ -25,4 +28,10 @@ public class RewriteJQueryFilter implements DependencyFilter {
         }
         return filtered;
     }
+
+    // for compactness, implementing the init listener here
+    @Override
+    public void serviceInit(ServiceInitEvent event) {
+        event.addDependencyFilter(this);
+    }
 }
diff --git a/test/dependency-rewrite-addon/src/main/resources/META-INF/services/com.vaadin.server.DependencyFilter b/test/dependency-rewrite-addon/src/main/resources/META-INF/services/com.vaadin.server.VaadinServiceInitListener
index f62efa26fd..f62efa26fd 100644
--- a/test/dependency-rewrite-addon/src/main/resources/META-INF/services/com.vaadin.server.DependencyFilter
+++ b/test/dependency-rewrite-addon/src/main/resources/META-INF/services/com.vaadin.server.VaadinServiceInitListener