Use startsWith instead of equals for booster version comparison, fixe…

…s issue with release
MicroShed · Sep 16, 2019 · c1d27b2 · c1d27b2
1 parent fc490a9
commit c1d27b2
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 56 deletions.
diff --git a/boost-common/src/main/java/boost/common/boosters/AbstractBoosterConfig.java b/boost-common/src/main/java/boost/common/boosters/AbstractBoosterConfig.java
@@ -36,32 +36,32 @@ public abstract class AbstractBoosterConfig {
     public static final String emptyString = "";
     public static final String RUNTIMES_GROUID = "org.microshed.boost.boms";
     public static final String BOOSTERS_GROUP_ID = "org.microshed.boost.boosters";
-    public static final String CDI_VERSION_12 = "1.2" + boostVersion + snapShot;
-    public static final String CDI_VERSION_20 = "2.0" + boostVersion + snapShot;
-    public static final String JAXRS_VERSION_20 = "2.0" + boostVersion + snapShot;
-    public static final String JAXRS_VERSION_21 = "2.1" + boostVersion + snapShot;
-    public static final String JSONB_VERSION_10 = "1.0" + boostVersion + snapShot;
-    public static final String JSONP_VERSION_10 = "1.0" + boostVersion + snapShot;
-    public static final String JSONP_VERSION_11 = "1.1" + boostVersion + snapShot;
-    public static final String JPA_VERSION_21 = "2.1" + boostVersion + snapShot;
-    public static final String JPA_VERSION_22 = "2.2" + boostVersion + snapShot;
-    public static final String MP_HEALTH_VERSION_20 = "2.0" + boostVersion + snapShot;
-    public static final String BEANVALIDATION_VERSION_20 = "2.0" + boostVersion + snapShot;
-    public static final String MP_HEALTH_VERSION_10 = "1.0" + boostVersion + snapShot;
-    public static final String MP_CONFIG_VERSION_13 = "1.3" + boostVersion + snapShot;
-    public static final String MP_JWT_VERSION_11 = "1.1" + boostVersion + snapShot;
-    public static final String MP_METRICS_VERSION_11 = "1.1" + boostVersion + snapShot;
-    public static final String MP_METRICS_VERSION_20 = "2.0" + boostVersion + snapShot;
-    public static final String MP_FAULTTOLERANCE_VERSION_11 = "1.1" + boostVersion + snapShot;
-    public static final String MP_FAULTTOLERANCE_VERSION_20 = "2.0" + boostVersion + snapShot;
-    public static final String MP_OPENAPI_VERSION_10 = "1.0" + boostVersion + snapShot;
-    public static final String MP_OPENAPI_VERSION_11 = "1.1" + boostVersion + snapShot;
-    public static final String MP_OPENTRACING_VERSION_11 = "1.1" + boostVersion + snapShot;
-    public static final String MP_OPENTRACING_VERSION_12 = "1.2" + boostVersion + snapShot;
-    public static final String MP_OPENTRACING_VERSION_13 = "1.3" + boostVersion + snapShot;
-    public static final String MP_RESTCLIENT_VERSION_11 = "1.1" + boostVersion + snapShot;
-    public static final String MP_RESTCLIENT_VERSION_12 = "1.2" + boostVersion + snapShot;
-    public static final String MP_RESTCLIENT_VERSION_13 = "1.3" + boostVersion + snapShot;
+    public static final String CDI_VERSION_12 = "1.2" + boostVersion + emptyString;
+    public static final String CDI_VERSION_20 = "2.0" + boostVersion + emptyString;
+    public static final String JAXRS_VERSION_20 = "2.0" + boostVersion + emptyString;
+    public static final String JAXRS_VERSION_21 = "2.1" + boostVersion + emptyString;
+    public static final String JSONB_VERSION_10 = "1.0" + boostVersion + emptyString;
+    public static final String JSONP_VERSION_10 = "1.0" + boostVersion + emptyString;
+    public static final String JSONP_VERSION_11 = "1.1" + boostVersion + emptyString;
+    public static final String JPA_VERSION_21 = "2.1" + boostVersion + emptyString;
+    public static final String JPA_VERSION_22 = "2.2" + boostVersion + emptyString;
+    public static final String MP_HEALTH_VERSION_10 = "1.0" + boostVersion + emptyString;
+    public static final String MP_HEALTH_VERSION_20 = "2.0" + boostVersion + emptyString;
+    public static final String BEANVALIDATION_VERSION_20 = "2.0" + boostVersion + emptyString;
+    public static final String MP_CONFIG_VERSION_13 = "1.3" + boostVersion + emptyString;
+    public static final String MP_JWT_VERSION_11 = "1.1" + boostVersion + emptyString;
+    public static final String MP_METRICS_VERSION_11 = "1.1" + boostVersion + emptyString;
+    public static final String MP_METRICS_VERSION_20 = "2.0" + boostVersion + emptyString;
+    public static final String MP_FAULTTOLERANCE_VERSION_11 = "1.1" + boostVersion + emptyString;
+    public static final String MP_FAULTTOLERANCE_VERSION_20 = "2.0" + boostVersion + emptyString;
+    public static final String MP_OPENAPI_VERSION_10 = "1.0" + boostVersion + emptyString;
+    public static final String MP_OPENAPI_VERSION_11 = "1.1" + boostVersion + emptyString;
+    public static final String MP_OPENTRACING_VERSION_11 = "1.1" + boostVersion + emptyString;
+    public static final String MP_OPENTRACING_VERSION_12 = "1.2" + boostVersion + emptyString;
+    public static final String MP_OPENTRACING_VERSION_13 = "1.3" + boostVersion + emptyString;
+    public static final String MP_RESTCLIENT_VERSION_11 = "1.1" + boostVersion + emptyString;
+    public static final String MP_RESTCLIENT_VERSION_12 = "1.2" + boostVersion + emptyString;
+    public static final String MP_RESTCLIENT_VERSION_13 = "1.3" + boostVersion + emptyString;
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.TYPE)

diff --git a/boost-maven/boost-maven-plugin/pom.xml b/boost-maven/boost-maven-plugin/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>io.openliberty.tools</groupId>
             <artifactId>liberty-maven-plugin</artifactId>
-            <version>3.0</version>
+            <version>3.0.1</version>
         </dependency>
 
         <!-- Other dependencies -->

diff --git a/boost-maven/boost-runtimes/runtime-openliberty/pom.xml b/boost-maven/boost-runtimes/runtime-openliberty/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.openliberty.tools</groupId>
             <artifactId>liberty-maven-plugin</artifactId>
-            <version>3.0</version>
+            <version>3.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>

diff --git a/...runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/LibertyRuntime.java b/...runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/LibertyRuntime.java
@@ -56,11 +56,11 @@ public class LibertyRuntime implements RuntimeI {
 
     private final String runtimeGroupId = "io.openliberty";
     private final String runtimeArtifactId = "openliberty-runtime";
-    private final String runtimeVersion = "19.0.0.8";
+    private final String runtimeVersion = "19.0.0.9";
 
     private String libertyMavenPluginGroupId = "io.openliberty.tools";
     private String libertyMavenPluginArtifactId = "liberty-maven-plugin";
-    private String libertyMavenPluginVersion = "3.0";
+    private String libertyMavenPluginVersion = "3.0.1";
 
     public LibertyRuntime() {
         this.boosterConfigs = null;

diff --git a/...src/main/java/boost/runtimes/openliberty/boosters/LibertyBeanValidationBoosterConfig.java b/...src/main/java/boost/runtimes/openliberty/boosters/LibertyBeanValidationBoosterConfig.java
@@ -27,7 +27,7 @@ public LibertyBeanValidationBoosterConfig(BoosterConfigParams params, BoostLogge
     }
 
     public String getFeature() {
-        if (getVersion().equals(BEANVALIDATION_VERSION_20)) {
+        if (getVersion().startsWith(BEANVALIDATION_VERSION_20)) {
             return BEANVALIDATION_20;
         } else {
             return null;

diff --git a/...penliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyCDIBoosterConfig.java b/...penliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyCDIBoosterConfig.java
@@ -26,10 +26,10 @@ public LibertyCDIBoosterConfig(BoosterConfigParams params, BoostLoggerI logger)
     }
 
     public String getFeature() {
-        if (getVersion().equals(CDI_VERSION_20)) {
+        if (getVersion().startsWith(CDI_VERSION_20)) {
             return CDI_20;
         }
-        if (getVersion().equals(CDI_VERSION_12)) {
+        if (getVersion().startsWith(CDI_VERSION_12)) {
             return CDI_12;
         }
         else {

diff --git a/...nliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJAXRSBoosterConfig.java b/...nliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJAXRSBoosterConfig.java
@@ -28,9 +28,9 @@ public LibertyJAXRSBoosterConfig(BoosterConfigParams params, BoostLoggerI logger
 
     @Override
     public String getFeature() {
-        if (getVersion().equals(JAXRS_VERSION_20)) {
+        if (getVersion().startsWith(JAXRS_VERSION_20)) {
             return JAXRS_20;
-        } else if (getVersion().equals(JAXRS_VERSION_21)) {
+        } else if (getVersion().startsWith(JAXRS_VERSION_21)) {
             return JAXRS_21;
         }
         return null;

diff --git a/...penliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJPABoosterConfig.java b/...penliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJPABoosterConfig.java
@@ -28,9 +28,9 @@ public LibertyJPABoosterConfig(BoosterConfigParams params, BoostLoggerI logger)
 
     @Override
     public String getFeature() {
-        if (getVersion().equals(JPA_VERSION_21)) {
+        if (getVersion().startsWith(JPA_VERSION_21)) {
             return JPA_21;
-        } else if (getVersion().equals(JPA_VERSION_22)) {
+        } else if (getVersion().startsWith(JPA_VERSION_22)) {
             return JPA_22;
         }
         return null;

diff --git a/...nliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJSONBBoosterConfig.java b/...nliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJSONBBoosterConfig.java
@@ -28,7 +28,7 @@ public LibertyJSONBBoosterConfig(BoosterConfigParams params, BoostLoggerI logger
 
     @Override
     public String getFeature() {
-        if (getVersion().equals(JSONB_VERSION_10)) {
+        if (getVersion().startsWith(JSONB_VERSION_10)) {
             return JSONB_10;
         }
         return null;

diff --git a/...nliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJSONPBoosterConfig.java b/...nliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJSONPBoosterConfig.java
@@ -27,10 +27,10 @@ public LibertyJSONPBoosterConfig(BoosterConfigParams params, BoostLoggerI logger
 
     @Override
     public String getFeature() {
-        if (getVersion().equals(JSONP_VERSION_10)) {
+        if (getVersion().startsWith(JSONP_VERSION_10)) {
             return JSONP_10;
         }
-        else if (getVersion().equals(JSONP_VERSION_11)) {
+        else if (getVersion().startsWith(JSONP_VERSION_11)) {
             return JSONP_11;
         }
         return null;

diff --git a/...berty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPConfigBoosterConfig.java b/...berty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPConfigBoosterConfig.java
@@ -27,7 +27,7 @@ public LibertyMPConfigBoosterConfig(BoosterConfigParams params, BoostLoggerI log
 
     @Override
     public String getFeature() {
-        if (getVersion().equals(MP_CONFIG_VERSION_13)) {
+        if (getVersion().startsWith(MP_CONFIG_VERSION_13)) {
             return MPCONFIG_13;
         }
         return null;

diff --git a/...c/main/java/boost/runtimes/openliberty/boosters/LibertyMPFaultToleranceBoosterConfig.java b/...c/main/java/boost/runtimes/openliberty/boosters/LibertyMPFaultToleranceBoosterConfig.java
@@ -27,9 +27,9 @@ public LibertyMPFaultToleranceBoosterConfig(BoosterConfigParams params, BoostLog
 
     @Override
     public String getFeature() {
-        if (getVersion().equals(MP_FAULTTOLERANCE_VERSION_11)) {
+        if (getVersion().startsWith(MP_FAULTTOLERANCE_VERSION_11)) {
             return MPFAULTTOLERANCE_11;
-        } else if (getVersion().equals(MP_FAULTTOLERANCE_VERSION_20)) {
+        } else if (getVersion().startsWith(MP_FAULTTOLERANCE_VERSION_20)) {
             return MPFAULTTOLERANCE_20;
         }
 

diff --git a/...berty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPHealthBoosterConfig.java b/...berty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPHealthBoosterConfig.java
@@ -29,9 +29,9 @@ public LibertyMPHealthBoosterConfig(BoosterConfigParams params, BoostLoggerI log
     public String getFeature() {
         String version = getVersion();
 
-        if (version.equals(MP_HEALTH_VERSION_10)) {
+        if (version.startsWith(MP_HEALTH_VERSION_10)) {
             return MPHEALTH_10;
-        } else if (version.equals(MP_HEALTH_VERSION_20)) {
+        } else if (version.startsWith(MP_HEALTH_VERSION_20)) {
             return MPHEALTH_20;
         }
 

diff --git a/...nliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPJWTBoosterConfig.java b/...nliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPJWTBoosterConfig.java
@@ -29,7 +29,7 @@ public LibertyMPJWTBoosterConfig(BoosterConfigParams params, BoostLoggerI logger
 
     @Override
     public String getFeature() {
-        if (getVersion().equals(MP_JWT_VERSION_11)) {
+        if (getVersion().startsWith(MP_JWT_VERSION_11)) {
             return MPJWT_11;
         }
         return null;

diff --git a/...erty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPMetricsBoosterConfig.java b/...erty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPMetricsBoosterConfig.java
@@ -32,9 +32,9 @@ public LibertyMPMetricsBoosterConfig(BoosterConfigParams params, BoostLoggerI lo
     public String getFeature() {
         String version = getVersion();
 
-        if (version.equals(MP_METRICS_VERSION_11)) {
+        if (version.startsWith(MP_METRICS_VERSION_11)) {
             return MPMETRICS_11;
-        } else if (version.equals(MP_METRICS_VERSION_20)) {
+        } else if (version.startsWith(MP_METRICS_VERSION_20)) {
             return MPMETRICS_20;
         }
         return null;

diff --git a/...erty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPOpenAPIBoosterConfig.java b/...erty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPOpenAPIBoosterConfig.java
@@ -27,9 +27,9 @@ public LibertyMPOpenAPIBoosterConfig(BoosterConfigParams params, BoostLoggerI lo
 
     @Override
     public String getFeature() {
-        if (getVersion().equals(MP_OPENAPI_VERSION_10)) {
+        if (getVersion().startsWith(MP_OPENAPI_VERSION_10)) {
             return MPOPENAPI_10;
-        } else if (getVersion().equals(MP_OPENAPI_VERSION_11)) {
+        } else if (getVersion().startsWith(MP_OPENAPI_VERSION_11)) {
             return MPOPENAPI_11;
         }
 

diff --git a/.../src/main/java/boost/runtimes/openliberty/boosters/LibertyMPOpenTracingBoosterConfig.java b/.../src/main/java/boost/runtimes/openliberty/boosters/LibertyMPOpenTracingBoosterConfig.java
@@ -27,11 +27,11 @@ public LibertyMPOpenTracingBoosterConfig(BoosterConfigParams params, BoostLogger
 
     @Override
     public String getFeature() {
-        if (getVersion().equals(MP_OPENTRACING_VERSION_11)) {
+        if (getVersion().startsWith(MP_OPENTRACING_VERSION_11)) {
             return MPOPENTRACING_11;
-        } else if (getVersion().equals(MP_OPENTRACING_VERSION_12)) {
+        } else if (getVersion().startsWith(MP_OPENTRACING_VERSION_12)) {
             return MPOPENTRACING_12;
-        } else if (getVersion().equals(MP_OPENTRACING_VERSION_13)) {
+        } else if (getVersion().startsWith(MP_OPENTRACING_VERSION_13)) {
             return MPOPENTRACING_13;
         }
 

diff --git a/...y/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPRestClientBoosterConfig.java b/...y/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPRestClientBoosterConfig.java
@@ -27,11 +27,11 @@ public LibertyMPRestClientBoosterConfig(BoosterConfigParams params, BoostLoggerI
 
     @Override
     public String getFeature() {
-        if (getVersion().equals(MP_RESTCLIENT_VERSION_11)) {
+        if (getVersion().startsWith(MP_RESTCLIENT_VERSION_11)) {
             return MPRESTCLIENT_11;
-        } else if (getVersion().equals(MP_RESTCLIENT_VERSION_12)) {
+        } else if (getVersion().startsWith(MP_RESTCLIENT_VERSION_12)) {
             return MPRESTCLIENT_12;
-        } else if (getVersion().equals(MP_RESTCLIENT_VERSION_13)) {
+        } else if (getVersion().startsWith(MP_RESTCLIENT_VERSION_13)) {
             return MPRESTCLIENT_13;
         }