Merge pull request #33 from knrc/cloud-1866

rcernich · web-flow · commit 59e637bf62d1 · 2017-07-07T14:09:04.000-06:00
Cloud 1866
diff --git a/activemq/pom.xml b/activemq/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-parent</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-parent</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/common/src/main/java/org/openshift/ping/common/compatibility/CompatibilityUtils.java b/common/src/main/java/org/openshift/ping/common/compatibility/CompatibilityUtils.java
@@ -16,6 +16,7 @@ private CompatibilityUtils() {
     * @return <code>true</code> when JGroups 4 is on the classpath. <code>false</code> otherwise.
     */
    public static boolean isJGroups4() {
-      return Version.major == 4;
+      final short[] decodedVersion = Version.decode(Version.version);
+      return decodedVersion[0] == 4;
    }
 }
diff --git a/dist/eap/build/pom.xml b/dist/eap/build/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-dist-eap</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dist/eap/download/pom.xml b/dist/eap/download/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-dist-eap</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dist/eap/pom.xml b/dist/eap/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-dist</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-parent</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dist/wildfly/build/pom.xml b/dist/wildfly/build/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-dist-wildfly</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dist/wildfly/download/pom.xml b/dist/wildfly/download/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-dist-wildfly</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dist/wildfly/pom.xml b/dist/wildfly/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-dist</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/dns/pom.xml b/dns/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-parent</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/examples/apps/basic-app-cache/pom.xml b/examples/apps/basic-app-cache/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.openshift.ping.examples</groupId>
        <artifactId>openshift-ping-examples-apps</artifactId>
-       <version>1.1.4.Final</version>
+       <version>1.1.5.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/examples/apps/basic-web-session/pom.xml b/examples/apps/basic-web-session/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.openshift.ping.examples</groupId>
        <artifactId>openshift-ping-examples-apps</artifactId>
-       <version>1.1.4.Final</version>
+       <version>1.1.5.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/examples/apps/hello-servlet/pom.xml b/examples/apps/hello-servlet/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.openshift.ping.examples</groupId>
        <artifactId>openshift-ping-examples-apps</artifactId>
-       <version>1.1.4.Final</version>
+       <version>1.1.5.Final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
 
diff --git a/examples/apps/pom.xml b/examples/apps/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-parent</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/kube/pom.xml b/kube/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.openshift.ping</groupId>
         <artifactId>openshift-ping-parent</artifactId>
-        <version>1.1.4.Final</version>
+        <version>1.1.5.Final</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>org.openshift.ping</groupId>
     <artifactId>openshift-ping-parent</artifactId>
-    <version>1.1.4.Final</version>
+    <version>1.1.5.Final</version>
     <packaging>pom</packaging>
 
     <name>OpenShift PING - Parent</name>

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ private CompatibilityUtils() {`
`16`	`16`	`* @return <code>true</code> when JGroups 4 is on the classpath. <code>false</code> otherwise.`
`17`	`17`	`*/`
`18`	`18`	`public static boolean isJGroups4() {`
`19`		`- return Version.major == 4;`
	`19`	`+ final short[] decodedVersion = Version.decode(Version.version);`
	`20`	`+ return decodedVersion[0] == 4;`
`20`	`21`	`}`
`21`	`22`	`}`