Merge pull request #499 from breakponchito/fixBuildIssues

Fix build issues for MP starter
microprofile · Oct 17, 2024 · 09ddc62 · 09ddc62
2 parents 4ac9237 + 123b86d
commit 09ddc62
Show file tree

Hide file tree

Showing 20 changed files with 107 additions and 21 deletions.
diff --git 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 }}

diff --git 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());
@@ -87,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");

diff --git 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;
 

diff --git a/...a/org/eclipse/microprofile/starter/addon/microprofile/servers/model/MicroprofileSpec.java b/...a/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/...va/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java b/...va/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

diff --git a/.../org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionSpecMatrix.java b/.../org/eclipse/microprofile/starter/addon/microprofile/servers/model/VersionSpecMatrix.java
@@ -164,6 +164,16 @@ 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.METRICS, "5.0")
+                        .add(MicroprofileSpec.TELEMETRY,"1.0"));
     }
 
     public Map<MicroprofileSpec, String> getSpecData(MicroProfileVersion version) {

diff --git a/...clipse/microprofile/starter/addon/microprofile/servers/model/VersionStandaloneMatrix.java b/...clipse/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<StandaloneMPSpec, String> getSpecData(MicroProfileVersion version) {

diff --git a/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java b/src/main/java/org/eclipse/microprofile/starter/core/TemplateVariableProvider.java
@@ -64,13 +64,20 @@ public Map<String, String> 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 {
             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/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";
     }
 }
diff --git a/src/main/java/org/eclipse/microprofile/starter/rest/APIEndpointV7.java 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/main/resources/files/ServiceHealthCheck.java.tpl b/src/main/resources/files/ServiceHealthCheck.java.tpl
@@ -1,12 +1,14 @@
 package [# th:text="${java_package}"/].health;
 
-import org.eclipse.microprofile.health.Health;
+import org.eclipse.microprofile.health.[# th:text="${microprofile_health}"/];
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 
 import [# th:text="${jakarta_ee_package}"/].enterprise.context.ApplicationScoped;
 
-@Health
+
+
+@[# th:text="${microprofile_health}"/]
 @ApplicationScoped
 public class ServiceHealthCheck implements HealthCheck {
 

diff --git 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."}}
+]}},"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."}}
diff --git 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."}}
+"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."}}
diff --git 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."}}
+]}},"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."}}