demo: update
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerServer.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerServer.java
index 113b109..3347c71 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerServer.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/DockerServer.java
@@ -45,10 +45,8 @@
       0,
       "tomee",
       new String[]{
-          "8-jre-1.7.5-plus",
-          "8-jre-7.0.5-plus",
-          "8-jre-7.1.0-plus",
-          "11-jre-8.0.0-M3-plus"},
+          "8.0-jre8-plus",
+          "9.0-jre11-plus"},
       false,
       " -Djsf=provided"),
   liberty(
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
index 9f97265..df218d1 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
@@ -59,20 +59,15 @@
   @Inject
   private Event<NavigationNode> events;
 
-  /**
-   * todo: Seems not working with Java EE 6, needs Java EE 7?
-   */
-//  @Inject
-//  private ServletContext servletContext;
+  @Inject
+  private ServletContext servletContext;
+
   public NavigationTree() {
     LOG.info("<init> " + this);
   }
 
   @PostConstruct
   protected void postConstruct() {
-    // todo: refactor with Java EE 7
-    final ServletContext servletContext;
-    servletContext = (ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext();
 
     final List<NavigationNode> nodes = new ArrayList<>();