From 19b48061e51f9bf2e8840a597d57c990bc9a5583 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 15 Jan 2024 20:59:14 +0330 Subject: [PATCH 01/25] Add MicroProfile Version 6 --- pom.xml | 71 ------------------- .../servers/model/MicroprofileSpec.java | 17 +++-- .../servers/model/SupportedServer.java | 4 +- .../servers/model/VersionSpecMatrix.java | 11 +++ .../core/model/MicroProfileVersion.java | 3 + 5 files changed, 26 insertions(+), 80 deletions(-) diff --git a/pom.xml b/pom.xml index c64577df..0ed7f4bc 100644 --- a/pom.xml +++ b/pom.xml @@ -294,78 +294,7 @@ sh - - thorntail - - true - - - - io.thorntail - jsf - - - io.thorntail - cdi - - - - io.thorntail - jaxrs - - - - org.jboss.resteasy - resteasy-client - ${resteasy.version} - test - - - - io.thorntail - arquillian - test - - - - - - - - io.thorntail - bom - ${version.thorntail} - pom - import - - - - - - mp-starter - - - io.thorntail - thorntail-maven-plugin - ${version.thorntail} - - - true - - - - - package - - - - - - - liberty diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/MicroprofileSpec.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/MicroprofileSpec.java index 113f1203..8d8a4089 100755 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/MicroprofileSpec.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/MicroprofileSpec.java @@ -35,42 +35,42 @@ public enum MicroprofileSpec { Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) , FAULT_TOLERANCE("fault_tolerance", "Fault Tolerance", "Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices", "https://github.com/eclipse/microprofile-fault-tolerance/releases/tag/%s", Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) , JWT_AUTH("JWT_auth", "JWT Auth", "JWT Propagation - propagate security across your microservices", "https://github.com/eclipse/microprofile-jwt-auth/releases/tag/%s", Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) , METRICS("metrics", "Metrics", "Metrics - Gather and create operational and business measurements for your microservices", "https://github.com/eclipse/microprofile-metrics/releases/tag/%s", Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) , HEALTH_CHECKS("health_checks", "Health", "Health - Verify the health of your microservices with custom verifications", "https://github.com/eclipse/microprofile-metrics/releases/tag/%s", Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) , OPEN_API("open_API", "OpenAPI", "Open API - Generate OpenAPI-compliant API documentation for your microservices", "https://github.com/eclipse/microprofile-open-api/releases/tag/%s", Arrays.asList(MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) , OPEN_TRACING("open_tracing", "OpenTracing", "Open Tracing - trace the flow of requests as they traverse your microservices", "https://github.com/eclipse/microprofile-opentracing/releases/tag/%s", @@ -84,7 +84,10 @@ public enum MicroprofileSpec { Arrays.asList(MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) + ,TELEMETRY("telemetry","Telemetry" + ,"Telemetry - pulls in OpenTelemetry Tracing and integrate with CDI and Jakarta RESTful Web Services", + "https://github.com/eclipse/microprofile-telemetry/releases/tag/$s", Arrays.asList( MicroProfileVersion.MP60)); ; // @formatter:on diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java index 16d349bd..208946ff 100755 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java @@ -68,7 +68,7 @@ public enum SupportedServer { Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60) , "%s.jar" //jarFileName , "" //jarParameters // Hard coded in server.xml since no way of overriding a default. , "9080" //portServiceA @@ -88,7 +88,7 @@ public enum SupportedServer { , PAYARA_MICRO("payara-micro", "Payara Micro", Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22 - , MicroProfileVersion.MP32, MicroProfileVersion.MP33, MicroProfileVersion.MP40) + , MicroProfileVersion.MP32, MicroProfileVersion.MP33, MicroProfileVersion.MP40,MicroProfileVersion.MP50,MicroProfileVersion.MP60) , "%s-microbundle.jar" //jarFileName , "--port 8180" //jarParameters , "8080" //portServiceA diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionSpecMatrix.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionSpecMatrix.java index 5aea7070..f659f3fc 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionSpecMatrix.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionSpecMatrix.java @@ -164,6 +164,17 @@ private void init() { .add(MicroprofileSpec.REST_CLIENT, "3.0.0") .add(MicroprofileSpec.OPEN_TRACING, "3.0") .add(MicroprofileSpec.METRICS, "4.0")); + data.put(MicroProfileVersion.MP60, + new EnumMapBuilder() + .add(MicroprofileSpec.CONFIG, "3.0") + .add(MicroprofileSpec.FAULT_TOLERANCE, "4.0") + .add(MicroprofileSpec.JWT_AUTH, "2.1") + .add(MicroprofileSpec.HEALTH_CHECKS, "4.0") + .add(MicroprofileSpec.OPEN_API, "3.1") + .add(MicroprofileSpec.REST_CLIENT, "3.0.0") + .add(MicroprofileSpec.OPEN_TRACING, "3.0") + .add(MicroprofileSpec.METRICS, "5.0") + .add(MicroprofileSpec.TELEMETRY,"1.0")); } public Map getSpecData(MicroProfileVersion version) { diff --git a/src/main/java/org/eclipse/microprofile/starter/core/model/MicroProfileVersion.java b/src/main/java/org/eclipse/microprofile/starter/core/model/MicroProfileVersion.java index 7f319013..e8230e24 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/model/MicroProfileVersion.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/model/MicroProfileVersion.java @@ -32,6 +32,7 @@ public enum MicroProfileVersion { // Order is important as it determines the order in the Dropdown on the screen. // @formatter:off NONE(null, "") + , MP60("6.0", "MP 6.0", Collections.singletonList(Constants.MP6X_ALTERNATIVE)) , MP50("5.0", "MP 5.0", Collections.singletonList(Constants.MP5X_ALTERNATIVE)) , MP41("4.1", "MP 4.1", Collections.singletonList(Constants.MP41_ALTERNATIVE)) , MP40("4.0", "MP 4.0", "4.0.1", Collections.singletonList(Constants.MP3X_ALTERNATIVE)) @@ -101,5 +102,7 @@ public static class Constants { public static final String MP3X_ALTERNATIVE = "mp3_x"; public static final String MP41_ALTERNATIVE = "mp4_1"; public static final String MP5X_ALTERNATIVE = "mp5_x"; + public static final String MP6X_ALTERNATIVE = "mp6_x"; + public static final String MP61_ALTERNATIVE = "mp6_1"; } } From 731399c1ae70bcb737d3cb6bbe8026dd2505977f Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 15 Jan 2024 21:02:00 +0330 Subject: [PATCH 02/25] Add MicroProfile Version 6 --- .../microprofile/servers/model/VersionStandaloneMatrix.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionStandaloneMatrix.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionStandaloneMatrix.java index 91c178f9..8884963e 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionStandaloneMatrix.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionStandaloneMatrix.java @@ -73,6 +73,9 @@ private void init() { data.put(MicroProfileVersion.MP50, new VersionStandaloneMatrix.EnumMapBuilder() .add(StandaloneMPSpec.GRAPHQL, "2.0")); + data.put(MicroProfileVersion.MP60, + new VersionStandaloneMatrix.EnumMapBuilder() + .add(StandaloneMPSpec.GRAPHQL, "2.0")); } public Map getSpecData(MicroProfileVersion version) { From 3e31654211cb9fc2f76cf60ecd0e5fb8433acf04 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 15 Jan 2024 21:18:46 +0330 Subject: [PATCH 03/25] Add MicroProfile Version 6 --- pom.xml | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/pom.xml b/pom.xml index 0ed7f4bc..c64577df 100644 --- a/pom.xml +++ b/pom.xml @@ -294,7 +294,78 @@ sh + + thorntail + + true + + + + io.thorntail + jsf + + + io.thorntail + cdi + + + + io.thorntail + jaxrs + + + + org.jboss.resteasy + resteasy-client + ${resteasy.version} + test + + + + io.thorntail + arquillian + test + + + + + + + + io.thorntail + bom + ${version.thorntail} + pom + import + + + + + + mp-starter + + + io.thorntail + thorntail-maven-plugin + ${version.thorntail} + + + true + + + + + package + + + + + + + liberty From 0f7893b41e292491f1f812caa84594cec4160932 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 29 Jan 2024 21:14:39 +0330 Subject: [PATCH 04/25] Add MicroProfile Version 6 --- .../microprofile/starter/core/TemplateVariableProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java b/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java index 70a75303..2dce26f1 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java @@ -64,7 +64,7 @@ public Map determineVariables(JessieModel model) { result.put("se_version", seVersion.getCode()); } - if (model.getSpecification().getMicroProfileVersion() == MicroProfileVersion.MP50) { + if (model.getSpecification().getMicroProfileVersion() == MicroProfileVersion.MP50||model.getSpecification().getMicroProfileVersion() == MicroProfileVersion.MP60) { result.put("jakarta_ee_package", "jakarta"); } else { From 8e4e2d7fd497280b5206c48c9c96f497b6f7fd2b Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 29 Jan 2024 21:44:06 +0330 Subject: [PATCH 05/25] Add MicroProfile Version 6 --- .../microprofile/starter/core/TemplateVariableProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java b/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java index 2dce26f1..67fc569d 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java @@ -64,7 +64,8 @@ public Map determineVariables(JessieModel model) { result.put("se_version", seVersion.getCode()); } - if (model.getSpecification().getMicroProfileVersion() == MicroProfileVersion.MP50||model.getSpecification().getMicroProfileVersion() == MicroProfileVersion.MP60) { + if (model.getSpecification().getMicroProfileVersion() == MicroProfileVersion.MP50 + || model.getSpecification().getMicroProfileVersion() == MicroProfileVersion.MP60) { result.put("jakarta_ee_package", "jakarta"); } else { From ecd7897179b2a385d34c5ef1ef81102b8a263629 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 12 Feb 2024 20:35:17 +0330 Subject: [PATCH 06/25] Add V7 Test Remove Open Tracing Add Telemetry --- src/it/java/org/eclipse/microprofile/starter/APITest.java | 4 ++++ .../microprofile/servers/model/VersionSpecMatrix.java | 1 - .../eclipse/microprofile/starter/rest/APIEndpointV7.java | 8 ++++++++ .../json_examples/v7/supportMatrix.json.segments | 4 ++++ .../json_examples/v7/supportMatrix_servers.json.segments | 3 +++ 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java create mode 100644 src/test/resources/json_examples/v7/supportMatrix.json.segments create mode 100644 src/test/resources/json_examples/v7/supportMatrix_servers.json.segments diff --git a/src/it/java/org/eclipse/microprofile/starter/APITest.java b/src/it/java/org/eclipse/microprofile/starter/APITest.java index 9badad27..8cac51c9 100644 --- a/src/it/java/org/eclipse/microprofile/starter/APITest.java +++ b/src/it/java/org/eclipse/microprofile/starter/APITest.java @@ -51,6 +51,8 @@ public class APITest { final Client client = ClientBuilder.newBuilder().build(); private WebTarget target; + private File v7Matrix; + private File v7MatrixServers; private File v6Matrix; private File v6MatrixServers; private File v5Matrix; @@ -63,6 +65,8 @@ public class APITest { @Before public void before() { target = client.target(API_URL); + v7Matrix = new File(getClass().getClassLoader().getResource("json_examples/v7/supportMatrix.json.segments").getFile()); + v7MatrixServers = new File(getClass().getClassLoader().getResource("json_examples/v7/supportMatrix_servers.json.segments").getFile()); v6Matrix = new File(getClass().getClassLoader().getResource("json_examples/v6/supportMatrix.json.segments").getFile()); v6MatrixServers = new File(getClass().getClassLoader().getResource("json_examples/v6/supportMatrix_servers.json.segments").getFile()); v5Matrix = new File(getClass().getClassLoader().getResource("json_examples/v5/supportMatrix.json.segments").getFile()); diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionSpecMatrix.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionSpecMatrix.java index f659f3fc..4227fadc 100644 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionSpecMatrix.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionSpecMatrix.java @@ -172,7 +172,6 @@ private void init() { .add(MicroprofileSpec.HEALTH_CHECKS, "4.0") .add(MicroprofileSpec.OPEN_API, "3.1") .add(MicroprofileSpec.REST_CLIENT, "3.0.0") - .add(MicroprofileSpec.OPEN_TRACING, "3.0") .add(MicroprofileSpec.METRICS, "5.0") .add(MicroprofileSpec.TELEMETRY,"1.0")); } diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java new file mode 100644 index 00000000..854d1e7a --- /dev/null +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java @@ -0,0 +1,8 @@ +package org.eclipse.microprofile.starter.rest; + +import javax.ws.rs.Path; + +@Path("/7") +public class APIEndpointV7 extends APIEndpointLatest { + // The current latest version +} diff --git a/src/test/resources/json_examples/v7/supportMatrix.json.segments b/src/test/resources/json_examples/v7/supportMatrix.json.segments new file mode 100644 index 00000000..227511c6 --- /dev/null +++ b/src/test/resources/json_examples/v7/supportMatrix.json.segments @@ -0,0 +1,4 @@ +{"configs":{" +MP33":{"supportedServers":[" +]},"MP32":{"supportedServers":[ +]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","TELEMETRY":" Telemetry - pulls in Telemetry Tracing and integrate with CDI and Jakarta RESTful Web Services","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file diff --git a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments new file mode 100644 index 00000000..f1d70a4f --- /dev/null +++ b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments @@ -0,0 +1,3 @@ +"LIBERTY":[{"mpVersion":"MP12","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","GRAPHQL"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]} +"WILDFLY_SWARM":[{"mpVersion":"MP12","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS"],"javaSEVersions":["SE8"],"buildTools":["MAVEN"]}] +"QUARKUS":[{"mpVersion":"MP32","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","TELEMETRY","REST_CLIENT"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]}] \ No newline at end of file From 246dba6e152aa9fe4c132fdac0ce5da87df620c8 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 12 Feb 2024 21:00:38 +0330 Subject: [PATCH 07/25] Add V7 Test Remove Open Tracing Add Telemetry --- src/it/java/org/eclipse/microprofile/starter/APITest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/it/java/org/eclipse/microprofile/starter/APITest.java b/src/it/java/org/eclipse/microprofile/starter/APITest.java index 8cac51c9..370b22f5 100644 --- a/src/it/java/org/eclipse/microprofile/starter/APITest.java +++ b/src/it/java/org/eclipse/microprofile/starter/APITest.java @@ -91,6 +91,8 @@ public void test(File segments, String uri) throws FileNotFoundException { @Test @RunAsClient public void supportMatrix() throws FileNotFoundException { + test(v7Matrix, "/7/supportMatrix"); + test(v7MatrixServers, "/7/supportMatrix/servers"); test(v6Matrix, "/6/supportMatrix"); test(v6MatrixServers, "/6/supportMatrix/servers"); test(v5Matrix, "/5/supportMatrix"); From d26404db4f77234e333d77b7d4f658c67644d632 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 12 Feb 2024 21:19:31 +0330 Subject: [PATCH 08/25] correct Address --- .../servers/model/MicroprofileSpec.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/MicroprofileSpec.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/MicroprofileSpec.java index 8d8a4089..857027df 100755 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/MicroprofileSpec.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/MicroprofileSpec.java @@ -35,42 +35,42 @@ public enum MicroprofileSpec { Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50, MicroProfileVersion.MP60)) , FAULT_TOLERANCE("fault_tolerance", "Fault Tolerance", "Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices", "https://github.com/eclipse/microprofile-fault-tolerance/releases/tag/%s", Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50, MicroProfileVersion.MP60)) , JWT_AUTH("JWT_auth", "JWT Auth", "JWT Propagation - propagate security across your microservices", "https://github.com/eclipse/microprofile-jwt-auth/releases/tag/%s", Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50, MicroProfileVersion.MP60)) , METRICS("metrics", "Metrics", "Metrics - Gather and create operational and business measurements for your microservices", "https://github.com/eclipse/microprofile-metrics/releases/tag/%s", Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50, MicroProfileVersion.MP60)) , HEALTH_CHECKS("health_checks", "Health", "Health - Verify the health of your microservices with custom verifications", "https://github.com/eclipse/microprofile-metrics/releases/tag/%s", Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50, MicroProfileVersion.MP60)) , OPEN_API("open_API", "OpenAPI", "Open API - Generate OpenAPI-compliant API documentation for your microservices", "https://github.com/eclipse/microprofile-open-api/releases/tag/%s", Arrays.asList(MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50, MicroProfileVersion.MP60)) , OPEN_TRACING("open_tracing", "OpenTracing", "Open Tracing - trace the flow of requests as they traverse your microservices", "https://github.com/eclipse/microprofile-opentracing/releases/tag/%s", @@ -84,10 +84,10 @@ public enum MicroprofileSpec { Arrays.asList(MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60)) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50, MicroProfileVersion.MP60)) ,TELEMETRY("telemetry","Telemetry" ,"Telemetry - pulls in OpenTelemetry Tracing and integrate with CDI and Jakarta RESTful Web Services", - "https://github.com/eclipse/microprofile-telemetry/releases/tag/$s", Arrays.asList( MicroProfileVersion.MP60)); + "https://github.com/eclipse/microprofile-telemetry/releases/tag/%s", Arrays.asList( MicroProfileVersion.MP60)); ; // @formatter:on From c7ad79fa18a3b205e702edd925b8d0c9b1bfcfb9 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Tue, 2 Apr 2024 22:14:49 +0330 Subject: [PATCH 09/25] correct Address --- src/main/resources/files/ServiceHealthCheck.java.tpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/resources/files/ServiceHealthCheck.java.tpl b/src/main/resources/files/ServiceHealthCheck.java.tpl index 7a9d5229..1dc3031b 100755 --- a/src/main/resources/files/ServiceHealthCheck.java.tpl +++ b/src/main/resources/files/ServiceHealthCheck.java.tpl @@ -1,12 +1,15 @@ package [# th:text="${java_package}"/].health; -import org.eclipse.microprofile.health.Health; + import org.eclipse.microprofile.health.Liveness; +import org.eclipse.microprofile.health.Readiness; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; import [# th:text="${jakarta_ee_package}"/].enterprise.context.ApplicationScoped; -@Health + + +@Liveness @ApplicationScoped public class ServiceHealthCheck implements HealthCheck { From ae62d4079c38f4da33d620f3fa9e0095690f14b9 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Wed, 10 Apr 2024 13:42:39 +0330 Subject: [PATCH 10/25] Resolve Conflict --- .../addon/microprofile/servers/model/SupportedServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java index 208946ff..4545dc24 100755 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java @@ -88,7 +88,8 @@ public enum SupportedServer { , PAYARA_MICRO("payara-micro", "Payara Micro", Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22 - , MicroProfileVersion.MP32, MicroProfileVersion.MP33, MicroProfileVersion.MP40,MicroProfileVersion.MP50,MicroProfileVersion.MP60) + , MicroProfileVersion.MP32, MicroProfileVersion.MP33, MicroProfileVersion.MP40, + MicroProfileVersion.MP50) , "%s-microbundle.jar" //jarFileName , "--port 8180" //jarParameters , "8080" //portServiceA From 6f5c2dd8ebb4781ceccb378f9ddbc1c22c542993 Mon Sep 17 00:00:00 2001 From: Emily Jiang Date: Mon, 15 Apr 2024 17:40:02 +0100 Subject: [PATCH 11/25] Update src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java --- .../org/eclipse/microprofile/starter/rest/APIEndpointV7.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java index 854d1e7a..16a07963 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java @@ -1,6 +1,6 @@ package org.eclipse.microprofile.starter.rest; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/7") public class APIEndpointV7 extends APIEndpointLatest { From 6f0e7c0c384b7ca928aa41c799c14979d7312509 Mon Sep 17 00:00:00 2001 From: Emily Jiang Date: Mon, 15 Apr 2024 17:45:46 +0100 Subject: [PATCH 12/25] Update src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java --- .../org/eclipse/microprofile/starter/rest/APIEndpointV7.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java index 16a07963..854d1e7a 100644 --- a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java +++ b/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java @@ -1,6 +1,6 @@ package org.eclipse.microprofile.starter.rest; -import jakarta.ws.rs.Path; +import javax.ws.rs.Path; @Path("/7") public class APIEndpointV7 extends APIEndpointLatest { From 532931ec59aaa7f35e0fdbf96549e067c23b96bd Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 15 Apr 2024 20:40:18 +0330 Subject: [PATCH 13/25] MP50 and MP60 use Liveness before MP50 and MP60 use Health --- .../microprofile/starter/core/TemplateVariableProvider.java | 6 ++++++ src/main/resources/files/ServiceHealthCheck.java.tpl | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java b/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java index 67fc569d..943985cf 100755 --- a/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java +++ b/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java @@ -72,6 +72,12 @@ public Map determineVariables(JessieModel model) { result.put("jakarta_ee_package", "javax"); } + if (model.getSpecification().getMicroProfileVersion() == MicroProfileVersion.MP50 + || model.getSpecification().getMicroProfileVersion() == MicroProfileVersion.MP60) { + result.put("microprofile_health", "Liveness"); + } else { + result.put("microprofile_health", "Health"); + } return result; } } diff --git a/src/main/resources/files/ServiceHealthCheck.java.tpl b/src/main/resources/files/ServiceHealthCheck.java.tpl index 1dc3031b..0f79ffd1 100755 --- a/src/main/resources/files/ServiceHealthCheck.java.tpl +++ b/src/main/resources/files/ServiceHealthCheck.java.tpl @@ -1,7 +1,6 @@ package [# th:text="${java_package}"/].health; - import org.eclipse.microprofile.health.Liveness; -import org.eclipse.microprofile.health.Readiness; +import org.eclipse.microprofile.health.[# th:text="${microprofile_health}"/]; import org.eclipse.microprofile.health.HealthCheck; import org.eclipse.microprofile.health.HealthCheckResponse; @@ -9,7 +8,7 @@ import [# th:text="${jakarta_ee_package}"/].enterprise.context.ApplicationScoped -@Liveness +@[# th:text="${microprofile_health}"/] @ApplicationScoped public class ServiceHealthCheck implements HealthCheck { From 5807fb2868834a85c4bda0d23b29992a76880f17 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 15 Apr 2024 21:10:25 +0330 Subject: [PATCH 14/25] MP60 for Payara Micro --- .../addon/microprofile/servers/model/SupportedServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java index 4545dc24..ea9ac7bf 100755 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java @@ -89,7 +89,7 @@ public enum SupportedServer { Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22 , MicroProfileVersion.MP32, MicroProfileVersion.MP33, MicroProfileVersion.MP40, - MicroProfileVersion.MP50) + MicroProfileVersion.MP50,MicroProfileVersion.MP60) , "%s-microbundle.jar" //jarFileName , "--port 8180" //jarParameters , "8080" //portServiceA From b96f0e804c8d6c3c8c988c8a10fc1d4d7a9130d2 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 15 Apr 2024 21:11:48 +0330 Subject: [PATCH 15/25] remove MP60 for Payara Micro --- .../addon/microprofile/servers/model/SupportedServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java index ea9ac7bf..4545dc24 100755 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java @@ -89,7 +89,7 @@ public enum SupportedServer { Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22 , MicroProfileVersion.MP32, MicroProfileVersion.MP33, MicroProfileVersion.MP40, - MicroProfileVersion.MP50,MicroProfileVersion.MP60) + MicroProfileVersion.MP50) , "%s-microbundle.jar" //jarFileName , "--port 8180" //jarParameters , "8080" //portServiceA From e17c5aca670c323097b7d7b612071363f1e74b96 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 22 Apr 2024 20:33:00 +0330 Subject: [PATCH 16/25] MP50 and MP60 use Liveness before MP50 and MP60 use Health --- .../json_examples/v7/supportMatrix.json.segments | 14 +++++++++++--- .../v7/supportMatrix_servers.json.segments | 4 +--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/test/resources/json_examples/v7/supportMatrix.json.segments b/src/test/resources/json_examples/v7/supportMatrix.json.segments index 227511c6..597ae78d 100644 --- a/src/test/resources/json_examples/v7/supportMatrix.json.segments +++ b/src/test/resources/json_examples/v7/supportMatrix.json.segments @@ -1,4 +1,12 @@ {"configs":{" -MP33":{"supportedServers":[" -]},"MP32":{"supportedServers":[ -]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","TELEMETRY":" Telemetry - pulls in Telemetry Tracing and integrate with CDI and Jakarta RESTful Web Services","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file +MP50":{"supportedServers":[" +]},"MP60":{"supportedServers":[ +]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices", +"OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices", +"HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications", +"REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner", +"FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices", +"JWT_AUTH":"JWT Propagation - propagate security across your microservices", +"TELEMETRY":" Telemetry - pulls in Telemetry Tracing and integrate with CDI and Jakarta RESTful Web Services", +"METRICS":"Metrics - Gather and create operational and business measurements for your microservices", +"GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file diff --git a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments index f1d70a4f..5a3ffa7f 100644 --- a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments +++ b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments @@ -1,3 +1 @@ -"LIBERTY":[{"mpVersion":"MP12","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","GRAPHQL"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]} -"WILDFLY_SWARM":[{"mpVersion":"MP12","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS"],"javaSEVersions":["SE8"],"buildTools":["MAVEN"]}] -"QUARKUS":[{"mpVersion":"MP32","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","TELEMETRY","REST_CLIENT"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]}] \ No newline at end of file +"LIBERTY":[{"mpVersion":"MP50","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","GRAPHQL"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]} \ No newline at end of file From 570f7611bb71c901cf230996fa20ab93bd0ffc51 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 22 Apr 2024 21:15:38 +0330 Subject: [PATCH 17/25] MP50 and MP60 use Liveness before MP50 and MP60 use Health --- .../resources/json_examples/v7/supportMatrix.json.segments | 3 +-- .../json_examples/v7/supportMatrix_servers.json.segments | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/resources/json_examples/v7/supportMatrix.json.segments b/src/test/resources/json_examples/v7/supportMatrix.json.segments index 597ae78d..441a686c 100644 --- a/src/test/resources/json_examples/v7/supportMatrix.json.segments +++ b/src/test/resources/json_examples/v7/supportMatrix.json.segments @@ -1,6 +1,5 @@ {"configs":{" -MP50":{"supportedServers":[" -]},"MP60":{"supportedServers":[ +"MP60":{"supportedServers":[ ]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices", "OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices", "HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications", diff --git a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments index 5a3ffa7f..25393d24 100644 --- a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments +++ b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments @@ -1 +1 @@ -"LIBERTY":[{"mpVersion":"MP50","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","GRAPHQL"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]} \ No newline at end of file +"LIBERTY":[{"mpVersion":"MP60","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","GRAPHQL"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]} \ No newline at end of file From fdc8e04d7bb85fadb8f51b5ba83e1ce825ed8833 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 15 Jul 2024 20:01:47 +0330 Subject: [PATCH 18/25] Comment Version V APITest --- src/it/java/org/eclipse/microprofile/starter/APITest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/it/java/org/eclipse/microprofile/starter/APITest.java b/src/it/java/org/eclipse/microprofile/starter/APITest.java index 370b22f5..d76206cf 100644 --- a/src/it/java/org/eclipse/microprofile/starter/APITest.java +++ b/src/it/java/org/eclipse/microprofile/starter/APITest.java @@ -65,8 +65,8 @@ public class APITest { @Before public void before() { target = client.target(API_URL); - v7Matrix = new File(getClass().getClassLoader().getResource("json_examples/v7/supportMatrix.json.segments").getFile()); - v7MatrixServers = new File(getClass().getClassLoader().getResource("json_examples/v7/supportMatrix_servers.json.segments").getFile()); + // v7Matrix = new File(getClass().getClassLoader().getResource("json_examples/v7/supportMatrix.json.segments").getFile()); + // v7MatrixServers = new File(getClass().getClassLoader().getResource("json_examples/v7/supportMatrix_servers.json.segments").getFile()); v6Matrix = new File(getClass().getClassLoader().getResource("json_examples/v6/supportMatrix.json.segments").getFile()); v6MatrixServers = new File(getClass().getClassLoader().getResource("json_examples/v6/supportMatrix_servers.json.segments").getFile()); v5Matrix = new File(getClass().getClassLoader().getResource("json_examples/v5/supportMatrix.json.segments").getFile()); @@ -91,8 +91,8 @@ public void test(File segments, String uri) throws FileNotFoundException { @Test @RunAsClient public void supportMatrix() throws FileNotFoundException { - test(v7Matrix, "/7/supportMatrix"); - test(v7MatrixServers, "/7/supportMatrix/servers"); + // test(v7Matrix, "/7/supportMatrix"); + // test(v7MatrixServers, "/7/supportMatrix/servers"); test(v6Matrix, "/6/supportMatrix"); test(v6MatrixServers, "/6/supportMatrix/servers"); test(v5Matrix, "/5/supportMatrix"); From 2ea634dbe8bfbad5663f64f2f18b423c161a0536 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 15 Jul 2024 20:24:39 +0330 Subject: [PATCH 19/25] unComment Version 7v APITest --- src/it/java/org/eclipse/microprofile/starter/APITest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/it/java/org/eclipse/microprofile/starter/APITest.java b/src/it/java/org/eclipse/microprofile/starter/APITest.java index d76206cf..370b22f5 100644 --- a/src/it/java/org/eclipse/microprofile/starter/APITest.java +++ b/src/it/java/org/eclipse/microprofile/starter/APITest.java @@ -65,8 +65,8 @@ public class APITest { @Before public void before() { target = client.target(API_URL); - // v7Matrix = new File(getClass().getClassLoader().getResource("json_examples/v7/supportMatrix.json.segments").getFile()); - // v7MatrixServers = new File(getClass().getClassLoader().getResource("json_examples/v7/supportMatrix_servers.json.segments").getFile()); + v7Matrix = new File(getClass().getClassLoader().getResource("json_examples/v7/supportMatrix.json.segments").getFile()); + v7MatrixServers = new File(getClass().getClassLoader().getResource("json_examples/v7/supportMatrix_servers.json.segments").getFile()); v6Matrix = new File(getClass().getClassLoader().getResource("json_examples/v6/supportMatrix.json.segments").getFile()); v6MatrixServers = new File(getClass().getClassLoader().getResource("json_examples/v6/supportMatrix_servers.json.segments").getFile()); v5Matrix = new File(getClass().getClassLoader().getResource("json_examples/v5/supportMatrix.json.segments").getFile()); @@ -91,8 +91,8 @@ public void test(File segments, String uri) throws FileNotFoundException { @Test @RunAsClient public void supportMatrix() throws FileNotFoundException { - // test(v7Matrix, "/7/supportMatrix"); - // test(v7MatrixServers, "/7/supportMatrix/servers"); + test(v7Matrix, "/7/supportMatrix"); + test(v7MatrixServers, "/7/supportMatrix/servers"); test(v6Matrix, "/6/supportMatrix"); test(v6MatrixServers, "/6/supportMatrix/servers"); test(v5Matrix, "/5/supportMatrix"); From b39931a901e6ed047045cf150c1d9d8ee0ff319b Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 15 Jul 2024 20:32:56 +0330 Subject: [PATCH 20/25] Add LIBERTY --- .../json_examples/v7/supportMatrix_servers.json.segments | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments index 25393d24..f2238a0b 100644 --- a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments +++ b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments @@ -1 +1 @@ -"LIBERTY":[{"mpVersion":"MP60","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","GRAPHQL"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]} \ No newline at end of file +"LIBERTY":[{"mpVersion":"MP60","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","GRAPHQL","TELEMETRY"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]} \ No newline at end of file From 0e82cdad29b6796906eae21fc4070bc24ad57c27 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Mon, 15 Jul 2024 21:04:19 +0330 Subject: [PATCH 21/25] Add LIBERTY --- .../json_examples/v7/supportMatrix.json.segments | 10 +--------- .../v7/supportMatrix_servers.json.segments | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/test/resources/json_examples/v7/supportMatrix.json.segments b/src/test/resources/json_examples/v7/supportMatrix.json.segments index 441a686c..3796662f 100644 --- a/src/test/resources/json_examples/v7/supportMatrix.json.segments +++ b/src/test/resources/json_examples/v7/supportMatrix.json.segments @@ -1,11 +1,3 @@ {"configs":{" "MP60":{"supportedServers":[ -]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices", -"OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices", -"HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications", -"REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner", -"FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices", -"JWT_AUTH":"JWT Propagation - propagate security across your microservices", -"TELEMETRY":" Telemetry - pulls in Telemetry Tracing and integrate with CDI and Jakarta RESTful Web Services", -"METRICS":"Metrics - Gather and create operational and business measurements for your microservices", -"GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file +]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","TELEMETRY":" Telemetry - pulls in Telemetry Tracing and integrate with CDI and Jakarta RESTful Web Services","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file diff --git a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments index f2238a0b..48a60b00 100644 --- a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments +++ b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments @@ -1 +1 @@ -"LIBERTY":[{"mpVersion":"MP60","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","GRAPHQL","TELEMETRY"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]} \ No newline at end of file +"LIBERTY":[{"mpVersion":"MP60","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","GRAPHQL","TELEMETRY"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]}] \ No newline at end of file From a633bbcc1df24fc68635c7ce0501531be583b209 Mon Sep 17 00:00:00 2001 From: Majid Mostafavi Date: Tue, 16 Jul 2024 00:37:10 +0330 Subject: [PATCH 22/25] Add LIBERTY --- .../resources/json_examples/v7/supportMatrix.json.segments | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/resources/json_examples/v7/supportMatrix.json.segments b/src/test/resources/json_examples/v7/supportMatrix.json.segments index 3796662f..97b9ea2c 100644 --- a/src/test/resources/json_examples/v7/supportMatrix.json.segments +++ b/src/test/resources/json_examples/v7/supportMatrix.json.segments @@ -1,3 +1,3 @@ {"configs":{" -"MP60":{"supportedServers":[ -]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","TELEMETRY":" Telemetry - pulls in Telemetry Tracing and integrate with CDI and Jakarta RESTful Web Services","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file +"MP60":{"supportedServers":["]}}, +"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","TELEMETRY":" Telemetry - pulls in Telemetry Tracing and integrate with CDI and Jakarta RESTful Web Services","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file From 7540474cdbc58a2d36459417bdc25cd088938916 Mon Sep 17 00:00:00 2001 From: Alfonso Altamirano Date: Tue, 8 Oct 2024 00:12:14 -0600 Subject: [PATCH 23/25] Fix issues for line content validation --- .../microprofile/servers/model/SupportedServer.java | 2 +- .../json_examples/v3/supportMatrix.json.segments | 6 +++++- .../v3/supportMatrix_servers.json.segments | 5 ++++- .../json_examples/v4/supportMatrix.json.segments | 6 +++++- .../v4/supportMatrix_servers.json.segments | 7 ++++++- .../json_examples/v5/supportMatrix.json.segments | 8 +++++++- .../v5/supportMatrix_servers.json.segments | 7 ++++++- .../json_examples/v6/supportMatrix.json.segments | 8 +++++++- .../json_examples/v7/supportMatrix.json.segments | 10 ++++++++-- .../v7/supportMatrix_servers.json.segments | 3 ++- 10 files changed, 51 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java index 4545dc24..3419b642 100755 --- a/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java +++ b/src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java @@ -68,7 +68,7 @@ public enum SupportedServer { Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32, MicroProfileVersion.MP33, - MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50,MicroProfileVersion.MP60) + MicroProfileVersion.MP40, MicroProfileVersion.MP41, MicroProfileVersion.MP50, MicroProfileVersion.MP60) , "%s.jar" //jarFileName , "" //jarParameters // Hard coded in server.xml since no way of overriding a default. , "9080" //portServiceA diff --git a/src/test/resources/json_examples/v3/supportMatrix.json.segments b/src/test/resources/json_examples/v3/supportMatrix.json.segments index b527a9f8..e165601a 100644 --- a/src/test/resources/json_examples/v3/supportMatrix.json.segments +++ b/src/test/resources/json_examples/v3/supportMatrix.json.segments @@ -2,4 +2,8 @@ MP33":{"supportedServers":[" "]},"MP32":{"supportedServers":[" "]},"MP30":{"supportedServers":[" -]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file +]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEAL +TH_CHECKS":"Health - Verify the health of your microservices with custom verifications", +"REST_CLIENT":"Rest Client +- Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across + your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file diff --git a/src/test/resources/json_examples/v3/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v3/supportMatrix_servers.json.segments index ab03aee9..d4682bf5 100644 --- a/src/test/resources/json_examples/v3/supportMatrix_servers.json.segments +++ b/src/test/resources/json_examples/v3/supportMatrix_servers.json.segments @@ -18,4 +18,7 @@ MP12":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS"], MP12":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS"] "WILDFLY":{" MP33":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","OPEN_TRACING","REST_CLIENT"] -"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file +"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API document +ation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications", +"REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Prop +agation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file diff --git a/src/test/resources/json_examples/v4/supportMatrix.json.segments b/src/test/resources/json_examples/v4/supportMatrix.json.segments index f83b9176..1a63e069 100644 --- a/src/test/resources/json_examples/v4/supportMatrix.json.segments +++ b/src/test/resources/json_examples/v4/supportMatrix.json.segments @@ -1,4 +1,8 @@ {"configs":{" MP33":{"supportedServers":[" ]},"MP32":{"supportedServers":[ -]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file +]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEAL +TH_CHECKS":"Health - Verify the health of your microservices with custom verifications", +"REST_CLIENT":"Rest Client +- Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across + your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file diff --git a/src/test/resources/json_examples/v4/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v4/supportMatrix_servers.json.segments index 5da4b255..6ebcfc65 100644 --- a/src/test/resources/json_examples/v4/supportMatrix_servers.json.segments +++ b/src/test/resources/json_examples/v4/supportMatrix_servers.json.segments @@ -3,4 +3,9 @@ TOMEE":[{ "mpVersion":"MP12","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS"],"javaSEVersions":["SE8"]}, {"mpVersion":"MP13","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","OPEN_TRACING","REST_CLIENT"],"javaSEVersions":["SE8"]},{ ]},{"mpVersion":"MP30","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","OPEN_TRACING","REST_CLIENT"],"javaSEVersions":["SE8","SE11"]},{"mpVersion":" -]}]},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices \ No newline at end of file +]}]},"descriptions":{"CONFIG":"Configuration - +externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your mic +roservices with custom verifications", +"REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner"," +FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing +- trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices \ No newline at end of file diff --git a/src/test/resources/json_examples/v5/supportMatrix.json.segments b/src/test/resources/json_examples/v5/supportMatrix.json.segments index f83b9176..28ccb36a 100644 --- a/src/test/resources/json_examples/v5/supportMatrix.json.segments +++ b/src/test/resources/json_examples/v5/supportMatrix.json.segments @@ -1,4 +1,10 @@ {"configs":{" MP33":{"supportedServers":[" ]},"MP32":{"supportedServers":[ -]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file +]}}," +descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS +":"Health - Verify the health of your microservices with custom verifications", +"REST_CLIENT":"Rest Client - Invoke +RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices", +"JWT_AUTH":"JWT Propagation - propagate security across your mic +roservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file diff --git a/src/test/resources/json_examples/v5/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v5/supportMatrix_servers.json.segments index 5da4b255..cd021387 100644 --- a/src/test/resources/json_examples/v5/supportMatrix_servers.json.segments +++ b/src/test/resources/json_examples/v5/supportMatrix_servers.json.segments @@ -3,4 +3,9 @@ TOMEE":[{ "mpVersion":"MP12","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS"],"javaSEVersions":["SE8"]}, {"mpVersion":"MP13","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","OPEN_TRACING","REST_CLIENT"],"javaSEVersions":["SE8"]},{ ]},{"mpVersion":"MP30","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","OPEN_TRACING","REST_CLIENT"],"javaSEVersions":["SE8","SE11"]},{"mpVersion":" -]}]},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices \ No newline at end of file +]}]},"descriptions":{"CONFIG":"Configuration - +externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your mic +roservices with custom verifications", +"REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner", +FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing +- trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices \ No newline at end of file diff --git a/src/test/resources/json_examples/v6/supportMatrix.json.segments b/src/test/resources/json_examples/v6/supportMatrix.json.segments index f83b9176..38ed6b86 100644 --- a/src/test/resources/json_examples/v6/supportMatrix.json.segments +++ b/src/test/resources/json_examples/v6/supportMatrix.json.segments @@ -1,4 +1,10 @@ {"configs":{" MP33":{"supportedServers":[" ]},"MP32":{"supportedServers":[ -]}},"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file +]}}," +descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS +":"Health - Verify the health of your microservices with custom verifications", +"REST_CLIENT":"Rest Client - Invoke +RESTful services in a type-safe manner", +"FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your mic +roservices","OPEN_TRACING":"Open Tracing - trace the flow of requests as they traverse your microservices","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file diff --git a/src/test/resources/json_examples/v7/supportMatrix.json.segments b/src/test/resources/json_examples/v7/supportMatrix.json.segments index 97b9ea2c..71c37b9f 100644 --- a/src/test/resources/json_examples/v7/supportMatrix.json.segments +++ b/src/test/resources/json_examples/v7/supportMatrix.json.segments @@ -1,3 +1,9 @@ {"configs":{" -"MP60":{"supportedServers":["]}}, -"descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS":"Health - Verify the health of your microservices with custom verifications","REST_CLIENT":"Rest Client - Invoke RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your microservices","TELEMETRY":" Telemetry - pulls in Telemetry Tracing and integrate with CDI and Jakarta RESTful Web Services","METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file +"MP60":{"supportedServers":["LIBERTY"], +descriptions":{"CONFIG":"Configuration - externalize and manage your configuration parameters outside your microservices","OPEN_API":"Open API - Generate OpenAPI-compliant API documentation for your microservices","HEALTH_CHECKS +":"Health - Verify the health of your microservices with custom verifications", +"REST_CLIENT":"Rest Client - Invoke +RESTful services in a type-safe manner","FAULT_TOLERANCE":"Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices","JWT_AUTH":"JWT Propagation - propagate security across your mic +roservices", +"TELEMETRY":"Telemetry - pulls in OpenTelemetry Tracing and integrate with CDI and Jakarta RESTful Web Services" +"METRICS":"Metrics - Gather and create operational and business measurements for your microservices","GRAPHQL":"GraphQL - GraphQL is a query language for APIs and a library for fulfilling those queries with your existing data."}} \ No newline at end of file diff --git a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments index 48a60b00..3b44c798 100644 --- a/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments +++ b/src/test/resources/json_examples/v7/supportMatrix_servers.json.segments @@ -1 +1,2 @@ -"LIBERTY":[{"mpVersion":"MP60","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","GRAPHQL","TELEMETRY"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]}] \ No newline at end of file +"LIBERTY":[ +{"mpVersion":"MP60","mpSpecs":["CONFIG","FAULT_TOLERANCE","JWT_AUTH","METRICS","HEALTH_CHECKS","OPEN_API","REST_CLIENT","TELEMETRY","GRAPHQL"],"javaSEVersions":["SE8","SE11"],"buildTools":["MAVEN","GRADLE"]}] \ No newline at end of file From 1cb80294fb89a78ba22fa33ed8fc46132fdd5d20 Mon Sep 17 00:00:00 2001 From: Alfonso Altamirano Date: Thu, 10 Oct 2024 17:19:58 -0600 Subject: [PATCH 24/25] upgrading upload-artifact to use v4 --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b42da2c4..57e78117 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,7 +70,7 @@ jobs: shell: bash run: find . -type d -name '*-reports' -o -name "*.log" | tar -czf test-reports-apitest.tgz -T - - name: Upload failure Archive (if maven failed) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: test-reports-apitest @@ -126,7 +126,7 @@ jobs: shell: bash run: find . -type d -name '*-reports' -o -name "*.log" | tar -czf test-reports-${{ matrix.runtime }}.tgz -T - - name: Upload failure Archive (if maven failed) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: failure() with: name: test-reports-${{ matrix.runtime }} From 123b86dd1d3a870c81931c3cfa2c3cbfb2d467f7 Mon Sep 17 00:00:00 2001 From: Alfonso Altamirano Date: Mon, 14 Oct 2024 14:29:45 -0600 Subject: [PATCH 25/25] testing increment for connect timeout and read timeout to minutes --- .../java/org/eclipse/microprofile/starter/TestMatrixTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java b/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java index ff49885d..8ac25ed8 100644 --- a/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java +++ b/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java @@ -78,7 +78,7 @@ public class TestMatrixTest { public static final String TMP = getWorkspaceDir(); public static final String API_URL = "http://127.0.0.1:9090/api"; - final Client client = ClientBuilder.newBuilder().build(); + final Client client = ClientBuilder.newBuilder().connectTimeout(10, TimeUnit.MINUTES).readTimeout(10, TimeUnit.MINUTES).build(); WebTarget target;