Merge pull request #249 from rdebusscher/issue247

Add MP3.2 with Helidon, Payara, Liberty and Thorntail

Author: rdebusscher

src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/MicroprofileSpec.java

@@ -33,42 +33,42 @@ public enum MicroprofileSpec {
             "Configuration - externalize and manage your configuration parameters outside your microservices",
             Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14,
                     MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22,
-                    MicroProfileVersion.MP30))
+                    MicroProfileVersion.MP30, MicroProfileVersion.MP32))
     , FAULT_TOLERANCE("fault_tolerance", "Fault Tolerance",
             "Fault Tolerance - all about bulkheads, timeouts, circuit breakers, retries, etc. for your microservices",
             Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14,
                     MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22,
-                    MicroProfileVersion.MP30))
+                    MicroProfileVersion.MP30, MicroProfileVersion.MP32))
     , JWT_AUTH("JWT_auth", "JWT Auth",
             "JWT Propagation - propagate security across your microservices",
             Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14,
                     MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22,
-                    MicroProfileVersion.MP30))
+                    MicroProfileVersion.MP30, MicroProfileVersion.MP32))
     , METRICS("metrics", "Metrics",
             "Metrics - Gather and create operational and business measurements for your microservices",
             Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14,
                     MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22,
-                    MicroProfileVersion.MP30))
+                    MicroProfileVersion.MP30, MicroProfileVersion.MP32))
     , HEALTH_CHECKS("health_checks", "Health Checks",
             "Health Checks - Verify the health of your microservices with custom verifications",
             Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14,
                     MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22,
-                    MicroProfileVersion.MP30))
+                    MicroProfileVersion.MP30, MicroProfileVersion.MP32))
     , OPEN_API("open_API", "OpenAPI",
             "Open API - Generate OpenAPI-compliant API documentation for your microservices",
             Arrays.asList(MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20,
                     MicroProfileVersion.MP21, MicroProfileVersion.MP22,
-                    MicroProfileVersion.MP30))
+                    MicroProfileVersion.MP30, MicroProfileVersion.MP32))
     , OPEN_TRACING("open_tracing", "OpenTracing",
             "Open Tracing - trace the flow of requests as they traverse your microservices",
             Arrays.asList(MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20,
                     MicroProfileVersion.MP21, MicroProfileVersion.MP22,
-                    MicroProfileVersion.MP30))
+                    MicroProfileVersion.MP30, MicroProfileVersion.MP32))
     , REST_CLIENT("rest_client", "TypeSafe Rest Client",
             "Rest Client - Invoke RESTful services in a type-safe manner",
             Arrays.asList(MicroProfileVersion.MP13, MicroProfileVersion.MP14, MicroProfileVersion.MP20,
                     MicroProfileVersion.MP21, MicroProfileVersion.MP22,
-                    MicroProfileVersion.MP30))
+                    MicroProfileVersion.MP30, MicroProfileVersion.MP32))
     ;
     // @formatter:on
 

src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java

@@ -39,7 +39,7 @@ public enum SupportedServer {
             )
     , THORNTAIL_V2("thorntail-v2", "Thorntail V2",
             Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP21,
-                    MicroProfileVersion.MP22, MicroProfileVersion.MP30)
+                    MicroProfileVersion.MP22, MicroProfileVersion.MP30, MicroProfileVersion.MP32)
             , "%s-thorntail.jar" //jarFileName
             , "-Dswarm.port.offset=100" //jarParameters
             , "8080" //portServiceA
@@ -48,7 +48,7 @@ public enum SupportedServer {
     , LIBERTY("liberty", "Open Liberty",
             Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14,
                     MicroProfileVersion.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22,
-                    MicroProfileVersion.MP30)
+                    MicroProfileVersion.MP30, MicroProfileVersion.MP32)
             , "%s.jar" //jarFileName
             , "" //jarParameters // Hard coded in server.xml since no way of overriding a default.
             , "8181" //portServiceA
@@ -64,7 +64,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.MP20, MicroProfileVersion.MP21, MicroProfileVersion.MP22
+                    , MicroProfileVersion.MP32)
             , "%s-microbundle.jar" //jarFileName
             , "--port 8180" //jarParameters
             , "8080" //portServiceA
@@ -79,7 +80,8 @@ public enum SupportedServer {
             , "8180" //portServiceB // This need to match with Port value from TomeeServer.adjustPOM
             )
     , HELIDON("helidon", "Helidon",
-            Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP22, MicroProfileVersion.MP30)
+            Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP22, MicroProfileVersion.MP30
+                    , MicroProfileVersion.MP32)
             , "%s.jar" //jarFileName
             , "" //jarParameters // Done by secondary/helidon/microprofile-config.properties
             , "8080" //portServiceA

src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/HelidonServer.java

@@ -120,6 +120,10 @@ public void adaptMavenModel(Model pomFile, JessieModel model, boolean mainProjec
 
             case NONE:
                 break;
+            case MP32:
+                helidonVersion = "1.4.0";
+                mpVersion = "3.2";
+                break;
             case MP30:
                 helidonVersion = "1.3.1";
                 mpVersion = "3.0";

src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/PayaraMicroServer.java

@@ -72,6 +72,9 @@ public void adaptMavenModel(Model pomFile, JessieModel model, boolean mainProjec
 
             case NONE:
                 break;
+            case MP32:
+                payaraVersion = "5.194";
+                break;
             case MP22:
                 payaraVersion = "5.192";
                 break;

src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/server/ThorntailServer.java

@@ -80,6 +80,9 @@ public void adaptMavenModel(Model pomFile, JessieModel model, boolean mainProjec
 
             case NONE:
                 break;
+            case MP32:
+                thorntailVersion = "2.6.0.Final";
+                break;
             case MP30:
                 thorntailVersion = "2.5.0.Final";
                 break;

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, "")
+    , MP32("3.2", "MP 3.2", Collections.singletonList(Constants.MP3X_ALTERNATIVE))
     , MP30("3.0", "MP 3.0", Collections.singletonList(Constants.MP3X_ALTERNATIVE))
     , MP22("2.2", "MP 2.2")
     , MP21("2.1", "MP 2.1")