diff -Nru src/org/jets3t/servlets/gatekeeper/impl/DefaultTransactionIdProvider.java src/org/jets3t/servlets/gatekeeper/impl-gil/DefaultTransactionIdProvider.java
--- src/org/jets3t/servlets/gatekeeper/impl/DefaultTransactionIdProvider.java	2011-09-18 20:46:02.000000000 +0200
+++ src/org/jets3t/servlets/gatekeeper/impl-gil/DefaultTransactionIdProvider.java	2011-09-19 18:06:11.567446165 +0200
@@ -24,8 +24,7 @@
 import org.jets3t.service.utils.gatekeeper.GatekeeperMessage;
 import org.jets3t.servlets.gatekeeper.ClientInformation;
 import org.jets3t.servlets.gatekeeper.TransactionIdProvider;
-import org.safehaus.uuid.UUID;
-import org.safehaus.uuid.UUIDGenerator;
+import java.util.UUID;
 
 /**
  * Default TransactionIdProvider implementation that generated random-based UUIDs using the
@@ -51,7 +50,7 @@
     public String getTransactionId(GatekeeperMessage requestMessage, ClientInformation clientInformation)
     {
         // Generate a UUID based on a random generation.
-        UUID uuid = UUIDGenerator.getInstance().generateRandomBasedUUID();
+        UUID uuid = UUID.randomUUID();
         return uuid.toString();
     }
 
diff -Nru src/org/jets3t/servlets/gatekeeper/impl/ExternalUuidProvider.java src/org/jets3t/servlets/gatekeeper/impl-gil/ExternalUuidProvider.java
--- src/org/jets3t/servlets/gatekeeper/impl/ExternalUuidProvider.java	2011-09-18 20:46:02.000000000 +0200
+++ src/org/jets3t/servlets/gatekeeper/impl-gil/ExternalUuidProvider.java	2011-09-19 18:07:04.514451057 +0200
@@ -24,8 +24,7 @@
 import org.jets3t.service.utils.gatekeeper.GatekeeperMessage;
 import org.jets3t.servlets.gatekeeper.ClientInformation;
 import org.jets3t.servlets.gatekeeper.TransactionIdProvider;
-import org.safehaus.uuid.UUID;
-import org.safehaus.uuid.UUIDGenerator;
+import java.util.UUID;
 
 /**
  * Uses an externally provided UUID obtained from an application property <tt>externalUUID</tt>
@@ -52,7 +51,7 @@
             return externalUuid;
         }
         // Use a generated UUID based on a random generation as a fallback if the external UUID isn't available.
-        UUID uuid = UUIDGenerator.getInstance().generateRandomBasedUUID();
+        UUID uuid = UUID.randomUUID();
         return uuid.toString();
     }