diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/queue/FilePersistenceStrategy.java mule-2.0.2/core/src/main/java/org/mule/util/queue/FilePersistenceStrategy.java
--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/queue/FilePersistenceStrategy.java	2008-03-13 06:58:26.000000000 -0400
+++ mule-2.0.2/core/src/main/java/org/mule/util/queue/FilePersistenceStrategy.java	2011-12-20 09:45:16.412899905 -0500
@@ -28,7 +28,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.safehaus.uuid.UUIDGenerator;
+import com.fasterxml.uuid.Generators;
+import com.fasterxml.uuid.NoArgGenerator;
 
 public class FilePersistenceStrategy implements QueuePersistenceStrategy, MuleContextAware
 {
@@ -41,7 +42,7 @@
 
     private File store;
 
-    private UUIDGenerator gen = UUIDGenerator.getInstance();
+    private NoArgGenerator gen = Generators.randomBasedGenerator();
 
     protected MuleContext muleContext;
 
@@ -58,7 +59,7 @@
 
     protected String getId(Object obj)
     {
-        String id = gen.generateRandomBasedUUID().toString();
+        String id = gen.generate().toString();
         return id;
     }
 
diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/queue/MemoryPersistenceStrategy.java mule-2.0.2/core/src/main/java/org/mule/util/queue/MemoryPersistenceStrategy.java
--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/queue/MemoryPersistenceStrategy.java	2007-08-27 16:15:25.000000000 -0400
+++ mule-2.0.2/core/src/main/java/org/mule/util/queue/MemoryPersistenceStrategy.java	2011-12-20 09:44:55.373901344 -0500
@@ -17,18 +17,19 @@
 import java.util.List;
 import java.util.Map;
 
-import org.safehaus.uuid.UUIDGenerator;
+import com.fasterxml.uuid.NoArgGenerator;
+import com.fasterxml.uuid.Generators;
 
 public class MemoryPersistenceStrategy implements QueuePersistenceStrategy
 {
 
-    private UUIDGenerator gen = UUIDGenerator.getInstance();
+    private NoArgGenerator gen = Generators.randomBasedGenerator();
 
     private Map map = Collections.synchronizedMap(new HashMap());
 
     protected Object getId(Object obj)
     {
-        return gen.generateRandomBasedUUID();
+        return gen.generate();
     }
 
     /*
diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/UUID.java mule-2.0.2/core/src/main/java/org/mule/util/UUID.java
--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/UUID.java	2007-11-27 10:37:40.000000000 -0500
+++ mule-2.0.2/core/src/main/java/org/mule/util/UUID.java	2011-12-20 09:44:13.069904236 -0500
@@ -10,7 +10,8 @@
 
 package org.mule.util;
 
-import org.safehaus.uuid.UUIDGenerator;
+import com.fasterxml.uuid.NoArgGenerator;
+import com.fasterxml.uuid.Generators;
 
 /**
  * <code>UUID</code> Generates a UUID using the JUG library
@@ -18,7 +19,7 @@
 // @ThreadSafe
 public final class UUID
 {
-    private static final UUIDGenerator generator = UUIDGenerator.getInstance();
+    private static final NoArgGenerator generator = Generators.timeBasedGenerator();
 
     private UUID()
     {
@@ -27,7 +28,7 @@
 
     public static String getUUID()
     {
-        return generator.generateTimeBasedUUID().toString();
+        return generator.generate().toString();
     }
 
 }
diff -ur mule-2.0.2.20080813/core/src/main/java/org/mule/util/xa/AbstractTransactionContext.java mule-2.0.2/core/src/main/java/org/mule/util/xa/AbstractTransactionContext.java
--- mule-2.0.2.20080813/core/src/main/java/org/mule/util/xa/AbstractTransactionContext.java	2008-05-02 19:50:27.000000000 -0400
+++ mule-2.0.2/core/src/main/java/org/mule/util/xa/AbstractTransactionContext.java	2011-12-20 09:44:32.044902939 -0500
@@ -12,14 +12,15 @@
 
 import javax.transaction.Status;
 
-import org.safehaus.uuid.UUIDGenerator;
+import com.fasterxml.uuid.NoArgGenerator;
+import com.fasterxml.uuid.Generators;
 
 public abstract class AbstractTransactionContext
 {
 
-    private static UUIDGenerator gen = UUIDGenerator.getInstance();
+    private static NoArgGenerator gen = Generators.timeBasedGenerator();
 
-    protected String id = gen.generateTimeBasedUUID().toString();
+    protected String id = gen.generate().toString();
     protected long timeout;
     protected int status;
     protected boolean readOnly;