4 files changed, 8 insertions, 7 deletions
diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCRepository.java b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCRepository.java
index 16f44cc..25f2fdb 100644
--- a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCRepository.java
+++ b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCRepository.java
@@ -35,6 +35,8 @@ import javax.sql.DataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.cojen.util.ThrowUnchecked;
+
 import com.amazon.carbonado.FetchException;
 import com.amazon.carbonado.IsolationLevel;
 import com.amazon.carbonado.MalformedTypeException;
@@ -58,7 +60,6 @@ import com.amazon.carbonado.sequence.SequenceValueProducer;
 import com.amazon.carbonado.spi.AbstractRepository;
 import com.amazon.carbonado.txn.TransactionManager;
 import com.amazon.carbonado.txn.TransactionScope;
-import com.amazon.carbonado.util.ThrowUnchecked;
 
 /**
  * Repository implementation backed by a JDBC accessible database.
diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCSupportStrategy.java b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCSupportStrategy.java
index 89756c5..0b29fa7 100644
--- a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCSupportStrategy.java
+++ b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCSupportStrategy.java
@@ -27,6 +27,8 @@ import java.io.Writer;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
+import org.cojen.util.ThrowUnchecked;
+
 import com.amazon.carbonado.FetchException;
 import com.amazon.carbonado.PersistException;
 import com.amazon.carbonado.RepositoryException;
@@ -36,8 +38,6 @@ import com.amazon.carbonado.sequence.SequenceValueGenerator;
 import com.amazon.carbonado.sequence.SequenceValueProducer;
 import com.amazon.carbonado.sequence.StoredSequence;
 
-import com.amazon.carbonado.util.ThrowUnchecked;
-
 /**
  * Allows database product specific features to be abstracted.
  *
diff --git a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java
index dd1d78b..2b6e695 100644
--- a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java
+++ b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java
@@ -21,6 +21,8 @@ package com.amazon.carbonado.repo.replicated;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.cojen.util.ThrowUnchecked;
+
 import com.amazon.carbonado.FetchException;
 import com.amazon.carbonado.OptimisticLockException;
 import com.amazon.carbonado.PersistException;
@@ -37,8 +39,6 @@ import com.amazon.carbonado.capability.ResyncCapability;
 import com.amazon.carbonado.spi.RepairExecutor;
 import com.amazon.carbonado.spi.TriggerManager;
 
-import com.amazon.carbonado.util.ThrowUnchecked;
-
 /**
  * All inserts/updates/deletes are first committed to the master storage, then
  * duplicated and committed to the replica.
diff --git a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepositoryBuilder.java b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepositoryBuilder.java
index f3c80ae..3cab768 100644
--- a/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepositoryBuilder.java
+++ b/src/main/java/com/amazon/carbonado/repo/sleepycat/BDBRepositoryBuilder.java
@@ -29,6 +29,8 @@ import java.util.Map;
 
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.cojen.util.ThrowUnchecked;
+
 import com.amazon.carbonado.Repository;
 import com.amazon.carbonado.RepositoryException;
 import com.amazon.carbonado.Storable;
@@ -40,8 +42,6 @@ import com.amazon.carbonado.raw.StorableCodecFactory;
 
 import com.amazon.carbonado.spi.AbstractRepositoryBuilder;
 
-import com.amazon.carbonado.util.ThrowUnchecked;
-
 import com.amazon.carbonado.ConfigurationException;
 
 /**