package com.commsen.em.contract.vaadin;

import com.commsen.em.annotations.Provides;
import com.commsen.em.annotations.Requires;

@Provides(value="vaadin", version="8.1.3")
@Requires(raw="osgi.identity;filter:='(&(osgi.identity=com.vaadin.osgi.integration)(version=8.1.3))'")
@Requires(raw="osgi.identity;filter:='(&(osgi.identity=com.vaadin.themes)(version=8.1.3))'")
@Requires(raw="osgi.identity;filter:='(&(osgi.identity=com.vaadin.client-compiled)(version=8.1.3))'")
@Requires(filter="(&(em.contract=servlet.container)(whiteboard=true)(version=6))")
public class VaadinContracts {}

@@ -121,16 +121,76 @@
 equires;
+%0Aimport com.commsen.em.annotations.RequiresServletContainer;
 %0A%0A@Provi
@@ -537,49 +537,24 @@
 ires
-(filter=%22(&(em.contract=s
+S
 ervlet
-.c
+C
 ontainer
 )(wh
@@ -553,26 +553,8 @@
 iner
-)(whiteboard=true)
 (ver
@@ -562,11 +562,12 @@
 ion=
-6))
+%223.0
 %22)%0Ap

Fix Vaadin's servlet contract