diff --git a/gms/impl/pom.xml b/gms/impl/pom.xml
index 1968d1e..6de0675 100644
--- a/gms/impl/pom.xml
+++ b/gms/impl/pom.xml
@@ -62,19 +62,6 @@
         <finalName>${project.artifactId}</finalName>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <!--exclude the Shoal classes that internally call JXTA specific classes -->
-                    <excludes>
-                        <exclude>**/com/sun/enterprise/ee/cms/impl/jxta/*.java</exclude>
-                        <exclude>**/com/sun/enterprise/jxtamgmt/**/*.java</exclude>
-                        <exclude>**/com/sun/enterprise/mgmt/transport/jxta/*.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
diff --git a/gms/impl/src/main/java/com/sun/enterprise/ee/cms/core/.gitkeep b/gms/impl/src/main/java/com/sun/enterprise/ee/cms/core/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/jxta/JxtaNetworkManager.java b/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/jxta/JxtaNetworkManager.java
index 424dafa..e207cf8 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/jxta/JxtaNetworkManager.java
+++ b/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/jxta/JxtaNetworkManager.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -315,7 +316,7 @@ public void removePeerID( final PeerID peerID ) {
 
     public boolean isConnected( final PeerID peerID ) {
         net.jxta.peer.PeerID jxtaPeerID = (net.jxta.peer.PeerID)peerID.getUniqueID();
-        return getRouteControl().isConnected( jxtaPeerID, getCachedRoute( jxtaPeerID ) );
+        return getRouteControl().isConnected(jxtaPeerID);
     }
 
     public net.jxta.peer.PeerID getJxtaPeerID( final String instanceName ) {
@@ -780,18 +781,19 @@ private PeerGroup startDomain() throws PeerGroupException, IOException {
         if( mcastPort > 0 ) {
             config.setMulticastPort( mcastPort );
         }
-        if( multicastPoolsize != 0 ) {
-            config.setMulticastPoolSize( multicastPoolsize );
-            if( LOG.isLoggable( Level.CONFIG ) ) {
-                LOG.config( "set jxta Multicast Poolsize to " + config.getMulticastPoolSize() );
-            }
-        }
+        // TODO: Not supported as of 2023, 3.0.2-SNAPSHOT
+//        if( multicastPoolsize != 0 ) {
+//            config.setMulticastPoolSize( multicastPoolsize );
+//            if( LOG.isLoggable( Level.CONFIG ) ) {
+//                LOG.config( "set jxta Multicast Poolsize to " + config.getMulticastPoolSize() );
+//            }
+//        }
 
         //if a machine has multiple network interfaces,
         //specify which interface the group communication should start on
         if( tcpAddress != null && !tcpAddress.equals( "" ) ) {
             config.setTcpInterfaceAddress( tcpAddress );
-            config.setMulticastInterface( tcpAddress );
+            config.setMulticastAddress(tcpAddress);
         }
         if( LOG.isLoggable( Level.CONFIG ) ) {
             LOG.config( "node config adv = " + config.getPlatformConfig().toString() );
diff --git a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/jxta/JxtaPipeManager.java b/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/jxta/JxtaPipeManager.java
index 08a9128..62692fb 100644
--- a/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/jxta/JxtaPipeManager.java
+++ b/gms/impl/src/main/java/com/sun/enterprise/mgmt/transport/jxta/JxtaPipeManager.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2023 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -106,11 +107,11 @@ public boolean send( net.jxta.peer.PeerID peerid, net.jxta.endpoint.Message mess
             output = null;
         for( int createOutputPipeAttempts = 0; output == null && createOutputPipeAttempts < MAX_RETRIES; createOutputPipeAttempts++ )
         {
-            route = networkManager.getCachedRoute( (PeerID)peerid );
+            route = networkManager.getCachedRoute( peerid );
             if( route != null ) {
                 try {
-                    output = new BlockingWireOutputPipe( networkManager.getNetPeerGroup(), pipeAdv, (PeerID)peerid, route );
-                } catch( IOException ioe ) {
+                    output = new BlockingWireOutputPipe( networkManager.getNetPeerGroup(), pipeAdv, peerid, route );
+                } catch( Exception ioe ) {
                     lastOne = ioe;
                 }
             }
diff --git a/gms/impl/src/main/java/com/sun/enterprise/osgi/.gitkeep b/gms/impl/src/main/java/com/sun/enterprise/osgi/.gitkeep
deleted file mode 100644
index e69de29..0000000