Update comparison table and description
diff --git a/src/main/jbake/content/comparison.adoc b/src/main/jbake/content/comparison.adoc
index b648039..6023aca 100644
--- a/src/main/jbake/content/comparison.adoc
+++ b/src/main/jbake/content/comparison.adoc
@@ -8,179 +8,42 @@
:n: icon:times[role="red"]
:c: icon:file-text-o[role="blue"]
-//in site-generator
+Apache TomEE has four distributions, each supporting a slightly different set of technologies and aimed to give you a choice in what you want included out-of-the-box. When in doubt, chose Apache TomEE Plume.
-Apache OpenEJB and Apache TomEE are born from the same project and community.
-They differ in two major ways, only one of them technical:
-
-* TomEE incorporates two additional projects; Tomcat and MyFaces
-* TomEE, as a name, more easily implies the breadth of technologies included
-
-Effectively, TomEE is a superset of OpenEJB. They share the same code and TomEE grew out of OpenEJB.
-
-Note: this table is for TomEE 1.x, TomEE 7 comments are under it.
-
-[cols="4,6*^1",options="header"]
+[cols="4,5*^1",options="header"]
|===
-| |Tomcat |TomEE WebProfile |TomEE MicroProfile |TomEE Plus |TomEE Plume |OpenEJB
-
-|Java Servlets
-| {y}
-| {y}
-| {y}
-| {y}
-| {y}
-|
-
-|Java ServerPages (JSP)
-| {y}
-| {y}
-| {y}
-| {y}
-| {y}
-|
-
-|Java ServerFaces (JSF)
-|
-| {y}
-| {y}
-| {y}
-| {y}
-|
-
-|Java Transaction API (JTA)
-|
-| {y}
-| {y}
-| {y}
-| {y}
-| {y}
-
-|Java Persistence API (JPA)
-|
-| {y}
-| {y}
-| {y}
-| {y}
-| {y}
-
-|Java Contexts and Dependency Injection (CDI)
-|
-| {y}
-| {y}
-| {y}
-| {y}
-| {y}
-
-|Java Authentication and Authorization Service (JAAS)
-|
-| {y}
-| {y}
-| {y}
-| {y}
-| {y}
-
-|Java Authorization Contract for Containers (JACC)
-|
-| {y}
-| {y}
-| {y}
-| {y}
-| {y}
-
-|JavaMail API
-|
-| {y}
-| {y}
-| {y}
-| {y}
-| {y}
-
-|Bean Validation
-|
-| {y}
-| {y}
-| {y}
-| {y}
-| {y}
-
-|Enterprise JavaBeans
-|
-| {y}
-| {y}
-| {y}
-| {y}
-| {y}
-
-|Java API for RESTful Web Services (JAX-RS)
-|
-| {y}
-| {y}
-| {y}
-| {y}
-| {y}
-
-|Java API for XML Web Services (JAX-WS)
-|
-|
-|
-| {y}
-| {y}
-| {y}
-
-|Java EE Connector Architecture
-|
-|
-|
-| {y}
-| {y}
-| {y}
-
-|Java Messaging Service (JMS)
-|
-|
-|
-| {y}
-| {y}
-| {y}
-
-|EclipseLink
-|
-|
-|
-| {y}
-|
-|
-
-|Mojarra
-|
-|
-|
-| {y}
-|
-|
+||Tomcat|TomEE WebProfile|TomEE MicroProfile|TomEE Plume|TomEE Plus
+|Jakarta Annotations|{y}|{y}|{y}|{y}|{y}
+|Jakarta Debugging Support for Other Languages|{y}|{y}|{y}|{y}|{y}
+|Jakarta Security (Java EE Enterprise Security)|{y}|{y}|{y}|{y}|{y}
+|Jakarta Server Pages (JSP)|{y}|{y}|{y}|{y}|{y}
+|Jakarta Servlet|{y}|{y}|{y}|{y}|{y}
+|Jakarta Standard Tag Library (JSTL)|{y}|{y}|{y}|{y}|{y}
+|Jakarta WebSocket|{y}|{y}|{y}|{y}|{y}
+|Jakarta Expression Language (EL)|{y}|{y}|{y}|{y}|{y}
+|Jakarta Activation||{y}|{y}|{y}|{y}
+|Jakarta Bean Validation||{y}|{y}|{y}|{y}
+|Jakarta Contexts and Dependency Injection (CDI)||{y}|{y}|{y}|{y}
+|Jakarta Dependency Injection (@Inject)||{y}|{y}|{y}|{y}
+|Jakarta Enterprise Beans (EJB)||{y}|{y}|{y}|{y}
+|Jakarta Interceptors||{y}|{y}|{y}|{y}
+|Jakarta JSON Binding (JSON-B)||{y}|{y}|{y}|{y}
+|Jakarta JSON Processing (JSON-P)||{y}|{y}|{y}|{y}
+|Jakarta Mail (JavaMail)||{y}|{y}|{y}|{y}
+|Jakarta Managed Beans||{y}|{y}|{y}|{y}
+|Jakarta Persistence (JPA)||{y}|{y}|{y}|{y}
+|Jakarta RESTful Web Services (JAX-RS)||{y}|{y}|{y}|{y}
+|Jakarta Server Faces (JSF)||{y}|{y}|{y}|{y}
+|Jakarta Transactions (JTA)||{y}|{y}|{y}|{y}
+|Jakarta XML Binding (JAXB)||{y}|{y}|{y}|{y}
+|Jakarta Authentication (JAAS)||||{y}|{y}
+|Jakarta Authorization (JACC)||||{y}|{y}
+|Jakarta Concurrency||||{y}|{y}
+|Jakarta Connectors||||{y}|{y}
+|Jakarta Enterprise Web Services||||{y}|{y}
+|Jakarta Messaging (JMS)||||{y}|{y}
+|Jakarta SOAP with Attachments||||{y}|{y}
+|Jakarta Web Services Metadata||||{y}|{y}
+|Jakarta XML Web Services (JAX-WS)||||{y}|{y}
+|Jakarta Batch (JBatch)|||||{y}
|===
-
-TomEE 7 targets JavaEE 7 and implements these specifications (in parenthesis the distibution(s) containing it if not part of the basic packages):
-
-* WebSocket JSR 356
-* JSON-P JSR 353
-* Servlet 3.1 JSR 340
-* JSF 2.2 JSR 344
-* EL 3.0 JSR 341
-* JSP 2.3 JSR 245
-* JSTL 1.2 JSR 52
-* JBatch (plus) JSR 352
-* Concurrency utilities for EE JSR 236
-* CDI 1.2, DI, Interceptors 1.2, Common Annotations JSR 346 + JSR 330 + JSR 318 + JSR 250
-* Bean Validation 1.1 JSR 349
-* EJB 3.2 JSR 345
-* JavaEE Connector JSR 322
-* JPA 2.1 JSR 338 (WARNING: openjpa based distributions provide a JPA 2.0 runtime)
-* JMS 2.0 JSR 343 (layer based on ActiveMQ 5 / JMS 1.1 for default distributions)
-* JTA 1.2 JSR 907
-* Javamail 1.4 (NOTE: EE 7 requires 1.5)
-* JAX-RS 2.0 JSR 339
-* JAX-WS 2.2 JSR 224
-* JAXB 2.2 JSR 222
-* and more inherited from TomEE 1/JavaEE 6
