From 9c1dd53aea0fea1af0c6cb53be137f25d43a2d4c Mon Sep 17 00:00:00 2001
From: Emily Jiang <emijiang6@googlemail.com>
Date: Wed, 9 Nov 2022 18:46:33 +0000
Subject: [PATCH] Final tidyup for MP 6.0 release (#282)

---
 pom.xml                                       | 32 ++++---------------
 spec/src/main/asciidoc/architecture.asciidoc  |  4 +--
 spec/src/main/asciidoc/required-apis.asciidoc |  4 +--
 3 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6658959..7bbd1bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,13 +108,13 @@
 
         <!-- MicroProfile specs  -->
         <config-version>3.0.2</config-version>
-        <ft-version>4.0.1</ft-version>
+        <ft-version>4.0.2</ft-version>
         <health-version>4.0.1</health-version>
-        <metrics-version>5.0.0-RC3</metrics-version> <!-- TODO Update to 5.0 -->
-        <jwt-version>2.1-RC5</jwt-version>
-        <openapi-version>3.1-RC4</openapi-version> <!-- TODO UPDATE TO 3.1 -->
+        <metrics-version>5.0.0</metrics-version> 
+        <jwt-version>2.1</jwt-version>
+        <openapi-version>3.1</openapi-version> 
         <rest-client-version>3.0.1</rest-client-version>
-        <telemetry-version>1.0-RC3</telemetry-version> <!-- TODO UPDATE TO 1.0 -->
+        <telemetry-version>1.0</telemetry-version> 
 
         <!-- other props  -->
         <!-- whether autorelease maven central staging repositories - default false to allow review and manually release repositories -->
@@ -138,7 +138,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <failOnError>false</failOnError> <!-- TODO - Metrics 5.0.0-RC3 failing javadoc -->
+                    <failOnError>false</failOnError> 
                     <additionalDependencies>
                         <additionalDependency>
                             <groupId>org.osgi</groupId>
@@ -177,18 +177,6 @@
                 <groupId>jakarta.platform</groupId>
                 <artifactId>jakarta.jakartaee-core-api</artifactId>
                 <version>${jakarta-version}</version>
-<!-- TODO This was a CDI exclusion. Still required?
-                <exclusions>
-                    <exclusion>
-                        <groupId>jakarta.ejb</groupId>
-                        <artifactId>jakarta.ejb-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>jakarta.el</groupId>
-                        <artifactId>jakarta.el-api</artifactId>
-                    </exclusion>
-                </exclusions>
--->
             </dependency>
             <dependency>
                 <groupId>org.eclipse.microprofile.config</groupId>
@@ -225,14 +213,6 @@
                 <artifactId>microprofile-rest-client-api</artifactId>
                 <version>${rest-client-version}</version>
             </dependency>
-<!-- TODO I'm assuming we don't need this since telemetry does not have an MP API
-            <dependency>
-                <groupId>org.eclipse.microprofile.telemetry.tracing</groupId>
-                <artifactId>microprofile-telemetry-tracing-parent</artifactId>
-                <version>${telemetry-version}</version>
-            </dependency>
--->
-            <!-- https://mvnrepository.com/artifact/org.osgi/org.osgi.annotation.versioning -->
         </dependencies>
     </dependencyManagement>
 
diff --git a/spec/src/main/asciidoc/architecture.asciidoc b/spec/src/main/asciidoc/architecture.asciidoc
index 3cc8808..95f00a6 100644
--- a/spec/src/main/asciidoc/architecture.asciidoc
+++ b/spec/src/main/asciidoc/architecture.asciidoc
@@ -49,7 +49,7 @@ The complete list of MicroProfile 6.0 specifications includes:
  - https://jakarta.ee/specifications/coreprofile/10/[Jakarta EE 10 Core Profile]
  - https://github.com/eclipse/microprofile-config/releases/tag/3.0.2[MicroProfile Config 3.0]
  - https://github.com/eclipse/microprofile-fault-tolerance/releases/tag/4.0.2[MicroProfile Fault Tolerance 4.0]
- - https://github.com/eclipse/microprofile-metrics/releases/tag/5.0[MicroProfile Metrics 5.0]
+ - https://github.com/eclipse/microprofile-metrics/releases/tag/5.0.0[MicroProfile Metrics 5.0]
  - https://github.com/eclipse/microprofile-health/releases/tag/4.0.1[MicroProfile Health 4.0]
  - https://github.com/eclipse/microprofile-telemetry/releases/tag/1.0[MicroProfile Telemetry 1.0]
  - https://github.com/eclipse/microprofile-open-api/releases/tag/3.1[MicroProfile OpenAPI 3.1]
@@ -60,7 +60,7 @@ MicroProfile 6.0 has the following backward incompatible changes compared to Mic
 
 * https://download.eclipse.org/microprofile/microprofile-metrics-5.0.0/microprofile-metrics-spec-5.0.0.html#_incompatible_changes[MicroProfile Metrics Incompatible changes]
 * MicroProfile OpenTracing replaced by MicroProfile Telemetry
-* Includes Jakarta EE 10 Core Profile instead of the five specifications in Jakarta EE 9.1
+* Includes Jakarta EE 10 Core Profile 
 
 The Maven coordinates for this Eclipse release are as follows:
 [source,xml]
diff --git a/spec/src/main/asciidoc/required-apis.asciidoc b/spec/src/main/asciidoc/required-apis.asciidoc
index 55893b0..b869586 100644
--- a/spec/src/main/asciidoc/required-apis.asciidoc
+++ b/spec/src/main/asciidoc/required-apis.asciidoc
@@ -77,7 +77,7 @@ Key aspects of the API include TimeOut, RetryPolicy, Fallback, Bulkhead, and Cir
 Fault Tolerance 3.0 is now dependent on Jakarta EE 8 technologies.
 
  - http://microprofile.io/project/eclipse/microprofile-fault-tolerance
- - https://github.com/eclipse/microprofile-fault-tolerance/releases/tag/4.0.1
+ - https://github.com/eclipse/microprofile-fault-tolerance/releases/tag/4.0.2
 
 [[mp-health-check]]
 === MicroProfile Health 4.0
@@ -103,7 +103,7 @@ MicroProfile Metrics provides a unified way for MicroProfile applications to exp
 Metrics will also provide a common Java API for exposing their telemetry data.
 
  - http://microprofile.io/project/eclipse/microprofile-metrics
- - https://github.com/eclipse/microprofile-metrics/releases/tag/5.0
+ - https://github.com/eclipse/microprofile-metrics/releases/tag/5.0.0
 
 [[mp-open-api]]
 === MicroProfile OpenAPI 3.1