diff --git a/distribution/pom.xml b/distribution/pom.xml
index 2cb78ea17..d2f0b57ef 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -135,13 +135,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.river</groupId>
-            <artifactId>reggie</artifactId>
+            <groupId>au.net.zeus.jgdms.reggie</groupId>
+            <artifactId>reggie-service</artifactId>
             <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.river</groupId>
+            <groupId>au.net.zeus.jgdms.reggie</groupId>
             <artifactId>reggie-dl</artifactId>
             <optional>true</optional>
         </dependency>
diff --git a/distribution/src/main/config/poms/reggie-dl-2.2.2.pom b/distribution/src/main/config/poms/reggie-dl-2.2.2.pom
index 37a9fe484..701551721 100644
--- a/distribution/src/main/config/poms/reggie-dl-2.2.2.pom
+++ b/distribution/src/main/config/poms/reggie-dl-2.2.2.pom
@@ -18,9 +18,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.river</groupId>
+    <groupId>au.net.zeus.jgdms.reggie</groupId>
     <artifactId>reggie-dl</artifactId>
-    <version>2.2.2</version>
+    <version>3.1</version>
     <url>http://river.apache.org</url>
     <description>River Lookup and Registry service client download jar</description>
 	
@@ -38,9 +38,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-dl</artifactId>
-	    <version>2.2.2</version>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-lib-dl</artifactId>
+	    <version>3.1</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 869ebb339..f6c8fa555 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,44 +177,44 @@
         <dependencies>
 
             <dependency>
-                <groupId>org.apache.river</groupId>
-                <artifactId>start</artifactId>
+                <groupId>au.net.zeus.jgdms</groupId>
+                <artifactId>jini-2.1-compat</artifactId>
                 <version>${river.version}</version>
             </dependency>
             
             <dependency>
-                <groupId>net.jini</groupId>
-                <artifactId>jsk-lib</artifactId>
+                <groupId>au.net.zeus.jgdms</groupId>
+                <artifactId>jgdms-lib</artifactId>
                 <version>${river.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>net.jini</groupId>
-                <artifactId>jsk-dl</artifactId>
+                <groupId>au.net.zeus.jgdms</groupId>
+                <artifactId>jgdms-lib-dl</artifactId>
                 <version>${river.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>net.jini</groupId>
-                <artifactId>jsk-platform</artifactId>
+                <groupId>au.net.zeus.jgdms</groupId>
+                <artifactId>jgdms-platform</artifactId>
                 <version>${river.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.river</groupId>
-                <artifactId>reggie</artifactId>
+                <groupId>au.net.zeus.jgdms.reggie</groupId>
+                <artifactId>reggie-service</artifactId>
                 <version>${river.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.river</groupId>
+                <groupId>au.net.zeus.jgdms.reggie</groupId>
                 <artifactId>reggie-dl</artifactId>
                 <version>${river.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>net.jini.lookup</groupId>
-                <artifactId>serviceui</artifactId>
+                <groupId>au.net.zeus.jgdms</groupId>
+                <artifactId>jgdms-ui-factory</artifactId>
                 <version>${river.version}</version>
             </dependency>
 
@@ -436,7 +436,7 @@
         <junit.version>4.12</junit.version>
         <rio.version>5.6.6</rio.version>
         <rio.plugin.version>5.1</rio.plugin.version>
-        <river.version>2.2.2</river.version>
+        <river.version>3.1.0</river.version>
         <hyperic.version>1.6.3.82</hyperic.version>
         <hyperic.repo.dir>${settings.localRepository}/org/hyperic/sigar-dist</hyperic.repo.dir>
         <sigar.dist>${hyperic.repo.dir}/${hyperic.version}/sigar-dist-${hyperic.version}</sigar.dist>
diff --git a/rio-core/rio-api/pom.xml b/rio-core/rio-api/pom.xml
index 999d36a7c..34298c4f0 100644
--- a/rio-core/rio-api/pom.xml
+++ b/rio-core/rio-api/pom.xml
@@ -22,13 +22,13 @@
     <dependencies>
 
         <dependency>
-		    <groupId>net.jini.lookup</groupId>
-		    <artifactId>serviceui</artifactId>
+		    <groupId>au.net.zeus.jgdms</groupId>
+		    <artifactId>jgdms-ui-factory</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-dl</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-lib-dl</artifactId>
         </dependency>
 
         <dependency>
@@ -39,10 +39,15 @@
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jini-2.1-compat</artifactId>
+        </dependency>      
 
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java b/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java
index c592d46ae..2dc12b143 100644
--- a/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java
+++ b/rio-core/rio-api/src/main/java/org/rioproject/deploy/ServiceProvisionEvent.java
@@ -45,7 +45,7 @@ public class ServiceProvisionEvent extends RemoteEvent implements Serializable {
      * @param source The event source
      */
     public ServiceProvisionEvent(Object source) {
-        super(source, ID, 0, null);
+        super(source, ID, 0, (MarshalledObject) null);
     }
 
     /**
@@ -58,7 +58,7 @@ public ServiceProvisionEvent(Object source) {
     public ServiceProvisionEvent(Object source,
                                  OperationalStringManager opStringManager, 
                                  ServiceElement svcElement) {
-        super(source, ID, 0, null);
+        super(source, ID, 0, (MarshalledObject) null);
         this.opStringManager = opStringManager;
         this.svcElement = svcElement;
     }
diff --git a/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java b/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java
index 1402e373d..65e552f21 100644
--- a/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java
+++ b/rio-core/rio-api/src/main/java/org/rioproject/event/RemoteServiceEvent.java
@@ -52,7 +52,7 @@ public RemoteServiceEvent(Object source) {
          * <code>source</code> is required by RemoteEvents' superclass, 
          * EventObject, which rejects a null for <code>source</code>.
          */
-        super(source, 0, 0, null);
+        super(source, 0, 0, (MarshalledObject) null);
         date = new Date(System.currentTimeMillis());
     }
 
diff --git a/rio-core/rio-lib/pom.xml b/rio-core/rio-lib/pom.xml
index 4614b7280..592143dd8 100644
--- a/rio-core/rio-lib/pom.xml
+++ b/rio-core/rio-lib/pom.xml
@@ -55,24 +55,37 @@
         </dependency>
 
 		<dependency>
-		    <groupId>org.apache.river</groupId>
-		    <artifactId>start</artifactId>
+		    <groupId>au.net.zeus.jgdms</groupId>
+		    <artifactId>service-starter</artifactId>
+                    <version>${river.version}</version>
             <optional>true</optional>
         </dependency>
 
         <dependency>
-		    <groupId>net.jini.lookup</groupId>
-		    <artifactId>serviceui</artifactId>
+		    <groupId>au.net.zeus.jgdms</groupId>
+		    <artifactId>jgdms-ui-factory</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-lib</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-lib</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-discovery-providers</artifactId>
+            <version>${river.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-jrmp</artifactId>
+            <version>${river.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/rio-core/rio-proxy/pom.xml b/rio-core/rio-proxy/pom.xml
index a8d8ed384..bf1765970 100644
--- a/rio-core/rio-proxy/pom.xml
+++ b/rio-core/rio-proxy/pom.xml
@@ -22,8 +22,8 @@
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/rio-platform/pom.xml b/rio-platform/pom.xml
index 83409bd54..6e8572b7d 100644
--- a/rio-platform/pom.xml
+++ b/rio-platform/pom.xml
@@ -18,8 +18,16 @@
     <dependencies>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
+            <version>${river.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-jeri</artifactId>
+            <version>${river.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -62,7 +70,7 @@
                             <Implementation-Version>${project.version}</Implementation-Version>
                             <Rio-Version>${project.version}</Rio-Version>
                             <Rio-Build>${maven.build.timestamp}</Rio-Build>
-                            <Class-Path>jsk-platform-${river.version}.jar groovy-all-${groovy.version}.jar logging/slf4j-api-${slf4j.version}.jar</Class-Path>
+                            <Class-Path>jgdms-platform-${river.version}.jar groovy-all-${groovy.version}.jar logging/slf4j-api-${slf4j.version}.jar</Class-Path>
                         </manifestEntries>
                     </archive>
                 </configuration>
diff --git a/rio-services/cybernode/cybernode-api/pom.xml b/rio-services/cybernode/cybernode-api/pom.xml
index 31c653f41..84519566b 100644
--- a/rio-services/cybernode/cybernode-api/pom.xml
+++ b/rio-services/cybernode/cybernode-api/pom.xml
@@ -23,13 +23,14 @@
         </dependency>
 
         <dependency>
-		    <groupId>net.jini.lookup</groupId>
-		    <artifactId>serviceui</artifactId>
+		    <groupId>au.net.zeus.jgdms</groupId>
+		    <artifactId>jgdms-ui-factory</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
+            <version>${river.version}</version>
             <scope>provided</scope>
         </dependency>
     
diff --git a/rio-services/cybernode/cybernode-proxy/pom.xml b/rio-services/cybernode/cybernode-proxy/pom.xml
index f7720f421..6b0f24367 100644
--- a/rio-services/cybernode/cybernode-proxy/pom.xml
+++ b/rio-services/cybernode/cybernode-proxy/pom.xml
@@ -29,8 +29,9 @@
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
+            <version>${river.version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/rio-services/cybernode/cybernode-service/pom.xml b/rio-services/cybernode/cybernode-service/pom.xml
index fb701d670..809942d1d 100644
--- a/rio-services/cybernode/cybernode-service/pom.xml
+++ b/rio-services/cybernode/cybernode-service/pom.xml
@@ -41,8 +41,8 @@
         </dependency>
 
         <dependency>
-		    <groupId>net.jini.lookup</groupId>
-		    <artifactId>serviceui</artifactId>
+		    <groupId>au.net.zeus.jgdms</groupId>
+		    <artifactId>jgdms-ui-factory</artifactId>
         </dependency>
 
         <dependency>
diff --git a/rio-services/cybernode/cybernode-ui/pom.xml b/rio-services/cybernode/cybernode-ui/pom.xml
index 3582235ca..bfa63fdd2 100644
--- a/rio-services/cybernode/cybernode-ui/pom.xml
+++ b/rio-services/cybernode/cybernode-ui/pom.xml
@@ -29,13 +29,13 @@
         </dependency>
 
         <dependency>
-		    <groupId>net.jini.lookup</groupId>
-		    <artifactId>serviceui</artifactId>
+		    <groupId>au.net.zeus.jgdms</groupId>
+		    <artifactId>jgdms-ui-factory</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
             <scope>provided</scope>
         </dependency>
     
diff --git a/rio-services/event-collector/event-collector-api/pom.xml b/rio-services/event-collector/event-collector-api/pom.xml
index bd017af35..637c4f851 100644
--- a/rio-services/event-collector/event-collector-api/pom.xml
+++ b/rio-services/event-collector/event-collector-api/pom.xml
@@ -23,8 +23,9 @@
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
+            <version>${river.version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/rio-services/event-collector/event-collector-proxy/pom.xml b/rio-services/event-collector/event-collector-proxy/pom.xml
index 96b4d8ebb..ac0dd8ad9 100644
--- a/rio-services/event-collector/event-collector-proxy/pom.xml
+++ b/rio-services/event-collector/event-collector-proxy/pom.xml
@@ -35,8 +35,9 @@
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
+            <version>${river.version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/rio-services/monitor/monitor-api/pom.xml b/rio-services/monitor/monitor-api/pom.xml
index 0faaa6be7..8611f9fd3 100644
--- a/rio-services/monitor/monitor-api/pom.xml
+++ b/rio-services/monitor/monitor-api/pom.xml
@@ -23,13 +23,13 @@
         </dependency>
 
         <dependency>
-		    <groupId>net.jini.lookup</groupId>
-		    <artifactId>serviceui</artifactId>
+		    <groupId>au.net.zeus.jgdms</groupId>
+		    <artifactId>jgdms-ui-factory</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/rio-services/monitor/monitor-proxy/pom.xml b/rio-services/monitor/monitor-proxy/pom.xml
index 6f7992b77..0ccab27a7 100644
--- a/rio-services/monitor/monitor-proxy/pom.xml
+++ b/rio-services/monitor/monitor-proxy/pom.xml
@@ -35,13 +35,13 @@
         </dependency>
 
         <dependency>
-		    <groupId>net.jini.lookup</groupId>
-		    <artifactId>serviceui</artifactId>
+		    <groupId>au.net.zeus.jgdms</groupId>
+		    <artifactId>jgdms-ui-factory</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
             <scope>provided</scope>
         </dependency>
     
diff --git a/rio-services/monitor/monitor-service/pom.xml b/rio-services/monitor/monitor-service/pom.xml
index f6c7e698b..56fd3ea75 100644
--- a/rio-services/monitor/monitor-service/pom.xml
+++ b/rio-services/monitor/monitor-service/pom.xml
@@ -35,8 +35,8 @@
         </dependency>
         
         <dependency>
-            <groupId>net.jini.lookup</groupId>
-		    <artifactId>serviceui</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-ui-factory</artifactId>
         </dependency>
 
         <dependency>
@@ -65,9 +65,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.river</groupId>
-            <artifactId>reggie</artifactId>
-            <version>${river.version}</version>
+            <groupId>au.net.zeus.jgdms.reggie</groupId>
+            <artifactId>reggie-service</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java b/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java
index 068572ae0..d229eb9c0 100644
--- a/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java
+++ b/rio-services/monitor/monitor-service/src/test/java/org/rioproject/monitor/service/DeploymentVerifierTest.java
@@ -187,8 +187,9 @@ private boolean hasGroup(Reggie registrar, String group) throws NoSuchObjectExce
 
     private void startLookup(String... groups) throws Exception {
         DynamicConfiguration configuration = new DynamicConfiguration();
-        configuration.setEntry("com.sun.jini.reggie", "initialMemberGroups", String[].class, groups);
+        configuration.setEntry("org.apache.river.reggie", "initialMemberGroups", String[].class, groups);
         registrar = new Reggie(configuration, null);
+        registrar.start();
         listener = new DL();
         discoveryManagement = new LookupDiscoveryManager(new String[]{"foo"}, null, listener);
         deploymentVerifier = new DeploymentVerifier(EmptyConfiguration.INSTANCE, discoveryManagement);
diff --git a/rio-start/pom.xml b/rio-start/pom.xml
index 255a47cdc..005260a13 100644
--- a/rio-start/pom.xml
+++ b/rio-start/pom.xml
@@ -23,13 +23,20 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.river</groupId>
-            <artifactId>start</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>service-starter</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jini-2.1-compat</artifactId>
+            <version>3.1.0</version>
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
         </dependency>
 
         <dependency>
diff --git a/rio-test/pom.xml b/rio-test/pom.xml
index e9ad28fa5..a199a1459 100644
--- a/rio-test/pom.xml
+++ b/rio-test/pom.xml
@@ -74,15 +74,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.river</groupId>
+            <groupId>au.net.zeus.jgdms.outrigger</groupId>
             <artifactId>outrigger-dl</artifactId>
             <version>${river.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.river</groupId>
-            <artifactId>outrigger</artifactId>
+            <groupId>au.net.zeus.jgdms.outrigger</groupId>
+            <artifactId>outrigger-service</artifactId>
             <version>${river.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/rio-tools/rio-ui/pom.xml b/rio-tools/rio-ui/pom.xml
index fa20153b9..c5e80d80e 100644
--- a/rio-tools/rio-ui/pom.xml
+++ b/rio-tools/rio-ui/pom.xml
@@ -57,8 +57,8 @@
         </dependency>
 
         <dependency>
-            <groupId>net.jini.lookup</groupId>
-            <artifactId>serviceui</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-ui-factory</artifactId>
         </dependency>
 
         <dependency>
diff --git a/rio-tools/watch-ui/pom.xml b/rio-tools/watch-ui/pom.xml
index 2659671ac..efeff61b7 100644
--- a/rio-tools/watch-ui/pom.xml
+++ b/rio-tools/watch-ui/pom.xml
@@ -22,8 +22,8 @@
         </dependency>
 
         <dependency>
-            <groupId>net.jini</groupId>
-            <artifactId>jsk-platform</artifactId>
+            <groupId>au.net.zeus.jgdms</groupId>
+            <artifactId>jgdms-platform</artifactId>
             <scope>provided</scope>
         </dependency>