Add support for JGroups ver. 4.x in session coordination;

Signed-off-by: Max Shaposhnik <[email protected]>

Author: mshaposhnik

buildsystem/compdeps/pom.xml

@@ -91,7 +91,7 @@
         <org.slf4j.version>1.7.25</org.slf4j.version>
         <wsdl4j.version>1.6.2</wsdl4j.version>
         <!-- CQ #7143 (Workswith) JGroups 3.2.8+ -->
-        <org.jgroups.version>3.6.17.Final</org.jgroups.version>
+        <org.jgroups.version>4.1.0.Final</org.jgroups.version>
     </properties>
 
     <build>

foundation/org.eclipse.persistence.extension/pom.xml

@@ -35,14 +35,4 @@
         <release.version>3.0.0</release.version>
         <testId>eclipselink.${componentId}.test</testId>
     </properties>
-
-    <dependencies>
-      <dependency>
-        <groupId>org.jgroups</groupId>
-        <artifactId>jgroups</artifactId>
-        <version>3.2.8.Final</version>
-        <scope>compile</scope>
-      </dependency>
-    </dependencies>
-
 </project>

foundation/org.eclipse.persistence.extension/src/org/eclipse/persistence/internal/sessions/coordination/jgroups/JGroupsRemoteConnection.java

@@ -93,9 +93,9 @@ public boolean isLocal() {
     protected Object executeCommandInternal(Object command) throws Exception {
         Message message = null;
         if (command instanceof byte[]) {
-            message = new Message(null, null, (byte[])command);
+            message = new Message(null, (byte[])command);
         } else {
-            message = new Message(null, null, command);
+            message = new Message(null, command);
         }
 
         Object[] debugInfo = null;

uploadToNexus.xml

@@ -184,7 +184,7 @@
         <property name="oracleddl.name"       value="EclipseLink OracleDDL Parser"/>
         <property name="oraclebndl.prefix"    value="org.eclipse.persistence.oracle"/>
         <property name="oraclebndl.criteria"  value="[1.0.0,9.0.0)"/>
-        <property name="oraclebndl.name"       value="EclipseLink Oracle Extensions"/>
+        <property name="oraclebndl.name"      value="EclipseLink Oracle Extensions"/>
         <property name="oraclenosql.prefix"   value="org.eclipse.persistence.oracle.nosql"/>
         <property name="oraclenosql.criteria" value="[1.0.0,9.0.0)"/>
         <property name="oraclenosql.name"     value="EclipseLink Oracle NoSQL database Extensions"/>
@@ -285,6 +285,7 @@
         <property name="dep.resource"      value="${dep.grp}jakarta.resource${dep.art}jakarta.resource-api${dep.ver}1.7.2${dep.type}jar${dep.scope}compile${dep.opt}false${dep.foot}"/>
         <property name="dep.servlet"       value="${dep.grp}jakarta.servlet${dep.art}jakarta.servlet-api${dep.ver}4.0.2${dep.type}jar${dep.scope}compile${dep.opt}false${dep.foot}"/>
         <property name="dep.wsdl"          value="${dep.grp}wsdl4j${dep.art}wsdl4j${dep.ver}1.6.3${dep.type}jar${dep.scope}compile${dep.opt}false${dep.foot}"/>
+        <property name="dep.jgroups"       value="${dep.grp}org.jgroups${dep.art}jgroups${dep.ver}4.1.0.Final${dep.type}jar${dep.scope}compile${dep.opt}true${dep.foot}"/>
         <!-- These are EclipseLink maintained public API bundles so are published under the EclipseLink GroupID, but with their own version info -->
         <property name="dep.persistence"   value="${dep.grp}org.eclipse.persistence${dep.art}${jpaapi.prefix}${dep.ver}${jpaapi.mvn.version}${dep.type}jar${dep.scope}compile${dep.opt}false${dep.foot}"/>
         <property name="dep.sdoapi"        value="${dep.grp}org.eclipse.persistence${dep.art}${sdoapi.prefix}${dep.ver}${sdoapi.mvn.version}${dep.type}jar${dep.scope}compile${dep.opt}false${dep.foot}"/>
@@ -321,7 +322,7 @@
         <property name="builder.dependencies"     value="${deps.head}${dep.core}${dep.dbws}${dep.moxy}${dep.jpa}${dep.nosql}${dep.oracle}${dep.servlet}${dep.wsdl}${dep.oracleddl}${deps.foot}"/>
         <property name="moxy.dependencies"        value="${deps.head}${dep.core}${deps.foot}"/>
         <property name="sdo.dependencies"         value="${deps.head}${dep.sdoapi}${dep.moxy}${dep.core}${deps.foot}"/>
-        <property name="extension.dependencies"   value="${deps.head}${dep.core}${deps.foot}"/>
+        <property name="extension.dependencies"   value="${deps.head}${dep.core}${dep.jgroups}${deps.foot}"/>
         <property name="corba.dependencies"       value="${deps.head}${dep.core}${dep.corba}${deps.foot}"/>
     </target>