From 3f001cbe899c7171669602aeb45e46fe66c91c99 Mon Sep 17 00:00:00 2001
From: Wayne Beaton <wayne.beaton@eclipse-foundation.org>
Date: Wed, 29 May 2024 13:37:10 -0400
Subject: [PATCH] Update images.

---
 source/diagrams/efsp_lifecycle.dot |  2 +-
 source/images/.gitignore           |  4 ++
 source/process.adoc                | 79 ++++++++++++++++++++++++++----
 3 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/source/diagrams/efsp_lifecycle.dot b/source/diagrams/efsp_lifecycle.dot
index 207bb80..0d6632b 100644
--- a/source/diagrams/efsp_lifecycle.dot
+++ b/source/diagrams/efsp_lifecycle.dot
@@ -12,7 +12,7 @@
 	rankdir=TB;
 	splines=ortho;
 	
-	node [shape=box,style=filled,fillcolor=white,fontsize=12];
+	node [shape=box,style=filled,fillcolor=white,fontname="sans-serif",fontsize=11];
 	{
 		rank=same;rankdir=LR;
 		start[shape=circle,label=""];
diff --git a/source/images/.gitignore b/source/images/.gitignore
index abee8b0..1fecf45 100644
--- a/source/images/.gitignore
+++ b/source/images/.gitignore
@@ -1,2 +1,6 @@
 /lifecycle.svg
 /plan_review.svg
+/efsp-lifecycle.svg
+/efsp-process-specification.svg
+/efsp-technical-specification.svg
+/efsp-transmogrify-final.svg
diff --git a/source/process.adoc b/source/process.adoc
index 7a140d5..d7d1427 100644
--- a/source/process.adoc
+++ b/source/process.adoc
@@ -10,7 +10,7 @@
 [[efsp]]
 = Eclipse Foundation Specification Process
 
-Version {project-version}. {effectiveDate}
+Version 1.4. May 15, 2024
 
 toc::[]
 
@@ -232,15 +232,47 @@ A Specification Version is a candidate Final Specification.
 Each Specification Version references specific versions of its constituent artifacts (if any).
 
 .Conceptual structure of a Process Specification
-[graphviz, images/process_specification, svg]
-----
-include::diagrams/efsp_process_spec.dot[]
-----
+[ditaa,shadows=false,transparent=true,format=svg,target="images/efsp-process-specification"]
+....
+    +-----------------------------+
+    |Specification Version        |
+    |/---------------------------\|
+    ||  Specification Document   ||
+    || (source and distribution) ||
+    |\---------------------------/|
+    +-----------------------------+
+....
 
 For a Technical Specification, constituent artifacts include the Specification Documents, zero or more other Specifications, one or more Compatible Implementations licensed under an Open Source License, and exactly one associated TCK.
 
 .Conceptual structure of a Technical Specification
-image::images/version.svg[image, 250]
+[ditaa,shadows=false,transparent=true,format=svg,target="images/efsp-technical-specification"]
+....
+    +-----------------------------+
+    |Specification Version        |
+    |/---------------------------\|
+    ||  Specification Document   ||
+    || (source and distribution) ||
+    |\---------------------------/|
+    |/---------------------------\|
+    ||    Technical Artifacts    ||
+    || (source and distribution) ||
+    |\---------------------------/|
+    |   +---+           +---+     |
+    |   |{o}|           |{o}|     |
+    |   |   |           |   +-\   |
+    |   +-+-+           +---+ |   |
+    +-----|-------------------|---+
+          V                   |    
+/---------------------------\ |       
+|           TCK             | | 1..n  
+| (source and distribution) | |       
+\---------------------------/ V       
+                    /----------------\
+                    |   Compatible   |
+                    | Implementation |
+                    \----------------/
+....
 
 When the result is a Major or Minor Release, a Project Team must engage in a xref:efsp-reviews-release[Release Review] to ratify a Specification Version as a Final Specification. When the result is a Service Release, a Specification Version is automatically a Final Specification.
 
@@ -366,7 +398,7 @@ No reviews are required for a Service Release.
 
 To produce a <<efsp-versions,Specification Version>> (with the exception of <<efsp-releases-service, Service Releases>>) a Project Team must engage in a formal Release Cycle under the supervision of the PMC and the Specification Committee.
 
-[graphviz, images/lifecycle, svg]
+[graphviz, images/efsp-lifecycle, svg]
 .An overview of the Eclipse Foundation Specification Process
 ----
 include::diagrams/efsp_lifecycle.dot[]
@@ -444,8 +476,37 @@ The Specification Document for the Final Specification must be distributed as re
 
 A TCK for a Final Specification in composite must be distributed under the Eclipse Foundation Technology Compatibility Kit License. Other technical artifacts must be distributed under an Open Source License.
 
-.Conceptual model of the transition from a Specification Version to a Final Specification. Note that no specific packaging technology or structure should be implied from this diagram.
-image::images/transmogrify.svg[image,750]
+.Conceptual model of the transition from a Specification Version to a Final Specification. 
+[ditaa,shadows=false,transparent=true,format=svg,target="images/efsp-transmogrify-final"]
+....
+                  /--Release Candidate                          /--Ratified
+                  |                                             |
+                  V                                             V
+    +-----------------------------+               +-----------------------------+
+    |Specification Version        |               |Final Specification          |
+    |/---------------------------\|               |/---------------------------\|
+    ||  Specification Document   ||               ||  Specification Document   ||
+    || (source and distribution) ||               ||     (read only text)      ||
+    |\---------------------------/|    Release    |\---------------------------/|
+    |/---------------------------\|    Review     |/---------------------------\|
+    ||    Technical Artifacts    ||-------------->||    Technical Artifacts    ||
+    || (source and distribution) ||               ||      (distribution)       ||
+    |\---------------------------/|               |\---------------------------/|
+    |   +---+           +---+     |               |/----------------\  +---+    |
+    |   |{o}|           |{o}|     |               ||      TCK       |  |{o}|    |
+    |   |   |           |   +-\   |               || (distribution) |  |   +-\  |
+    |   +-+-+           +---+ |   |               |\----------------/  +---+ |  |
+    +-----|-------------------|---+               +--------------------------|--+
+          V                   |                                              |
+/---------------------------\ |                          /----------------\  | 1..n
+|           TCK             | | 1..n                     |   Compatible   |<-/
+| (source and distribution) | |                          | Implementation |
+\---------------------------/ V                          \----------------/
+                    /----------------\                            
+                    |   Compatible   |                            
+                    | Implementation |                            
+                    \----------------/                            
+....
 
 == Exceptions
 
-- 
GitLab