Index: lingo-assembly/pom.xml
===================================================================
--- lingo-assembly/pom.xml	(revision 183)
+++ lingo-assembly/pom.xml	(working copy)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.logicblaze.lingo</groupId>
     <artifactId>lingo-parent</artifactId>
-    <version>1.3</version>
+    <version>1.3-jdk15</version>
   </parent>
   <dependencies>
     <dependency>
@@ -76,4 +76,4 @@
     </plugins>
   </build>
   
-</project>
\ No newline at end of file
+</project>
Index: lingo/src/test/java/org/logicblaze/lingo/util/TimeoutMapTest.java
===================================================================
--- lingo/src/test/java/org/logicblaze/lingo/util/TimeoutMapTest.java	(revision 183)
+++ lingo/src/test/java/org/logicblaze/lingo/util/TimeoutMapTest.java	(working copy)
@@ -17,9 +17,10 @@
  **/
 package org.logicblaze.lingo.util;
 
-import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor;
 import junit.framework.TestCase;
 
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
 /**
  * 
  * @version $Revision$
Index: lingo/src/test/java/org/logicblaze/lingo/util/JmsQueueTest.java
===================================================================
--- lingo/src/test/java/org/logicblaze/lingo/util/JmsQueueTest.java	(revision 183)
+++ lingo/src/test/java/org/logicblaze/lingo/util/JmsQueueTest.java	(working copy)
@@ -17,9 +17,6 @@
  **/
 package org.logicblaze.lingo.util;
 
-import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.logicblaze.lingo.jms.JmsClient;
@@ -29,6 +26,8 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 import junit.framework.TestCase;
 
Index: lingo/src/test/java/org/logicblaze/lingo/jmx/remote/JmxRemoteTest.java
===================================================================
--- lingo/src/test/java/org/logicblaze/lingo/jmx/remote/JmxRemoteTest.java	(revision 183)
+++ lingo/src/test/java/org/logicblaze/lingo/jmx/remote/JmxRemoteTest.java	(working copy)
@@ -18,6 +18,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 import javax.management.Attribute;
 import javax.management.MBeanInfo;
 import javax.management.MBeanServer;
@@ -35,7 +36,6 @@
 import junit.framework.TestCase;
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  
Index: lingo/src/main/java/org/logicblaze/lingo/lock/LockManager.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/lock/LockManager.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/lock/LockManager.java	(working copy)
@@ -19,7 +19,7 @@
 
 import org.apache.activemq.Service;
 
-import edu.emory.mathcs.backport.java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReadWriteLock;
 
 /**
  * Represents the interface of a distributed lock manager. Nodes can acquire locks
Index: lingo/src/main/java/org/logicblaze/lingo/lock/NonDeadlockLockManager.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/lock/NonDeadlockLockManager.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/lock/NonDeadlockLockManager.java	(working copy)
@@ -17,13 +17,13 @@
  **/
 package org.logicblaze.lingo.lock;
 
-import edu.emory.mathcs.backport.java.util.concurrent.locks.ReadWriteLock;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import javax.jms.JMSException;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
  * A simple implementation which just uses in-JVM locks.
Index: lingo/src/main/java/org/logicblaze/lingo/lock/DeadlockingWriteLock.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/lock/DeadlockingWriteLock.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/lock/DeadlockingWriteLock.java	(working copy)
@@ -17,16 +17,17 @@
  **/
 package org.logicblaze.lingo.lock;
 
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Condition;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  *
  * @version $Revision$
  */
-public class DeadlockingWriteLock implements Lock {
+public class DeadlockingWriteLock implements Lock
+{
     private ReentrantLock delegate;
 
     public void lock() {
Index: lingo/src/main/java/org/logicblaze/lingo/jms/impl/AsyncReplyHandler.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/jms/impl/AsyncReplyHandler.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/jms/impl/AsyncReplyHandler.java	(working copy)
@@ -17,8 +17,6 @@
  **/
 package org.logicblaze.lingo.jms.impl;
 
-import edu.emory.mathcs.backport.java.util.concurrent.FutureTask;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.logicblaze.lingo.MetadataStrategy;
@@ -31,6 +29,7 @@
 import javax.jms.Message;
 
 import java.lang.reflect.Method;
+import java.util.concurrent.FutureTask;
 
 /**
  * @version $Revision$
Index: lingo/src/main/java/org/logicblaze/lingo/jms/impl/FutureHandler.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/jms/impl/FutureHandler.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/jms/impl/FutureHandler.java	(working copy)
@@ -18,13 +18,13 @@
 package org.logicblaze.lingo.jms.impl;
 
 import EDU.oswego.cs.dl.util.concurrent.FutureResult;
-import edu.emory.mathcs.backport.java.util.concurrent.Callable;
-import edu.emory.mathcs.backport.java.util.concurrent.FutureTask;
 
 import org.logicblaze.lingo.jms.ReplyHandler;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
 
 /**
  * A {@link FutureResult} which implements
Index: lingo/src/main/java/org/logicblaze/lingo/jms/impl/MultiplexingRequestor.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/jms/impl/MultiplexingRequestor.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/jms/impl/MultiplexingRequestor.java	(working copy)
@@ -17,10 +17,6 @@
  **/
 package org.logicblaze.lingo.jms.impl;
 
-import edu.emory.mathcs.backport.java.util.concurrent.FutureTask;
-import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.logicblaze.lingo.jms.FailedToProcessResponse;
@@ -38,6 +34,9 @@
 import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * A {@link org.logicblaze.lingo.jms.Requestor} which will use a single
Index: lingo/src/main/java/org/logicblaze/lingo/jms/marshall/CompositeHeaderMarshaller.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/jms/marshall/CompositeHeaderMarshaller.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/jms/marshall/CompositeHeaderMarshaller.java	(working copy)
@@ -1,6 +1,5 @@
 package org.logicblaze.lingo.jms.marshall;
 
-import edu.emory.mathcs.backport.java.util.Collections;
 import org.logicblaze.lingo.LingoInvocation;
 import org.logicblaze.lingo.jms.Requestor;
 import org.springframework.remoting.support.RemoteInvocationResult;
@@ -10,6 +9,7 @@
 import javax.jms.ObjectMessage;
 import javax.jms.Session;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
Index: lingo/src/main/java/org/logicblaze/lingo/jms/JmsClient.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/jms/JmsClient.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/jms/JmsClient.java	(working copy)
@@ -17,8 +17,6 @@
  **/
 package org.logicblaze.lingo.jms;
 
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.logicblaze.lingo.jms.impl.DefaultJmsProducer;
@@ -34,6 +32,7 @@
 import javax.jms.QueueBrowser;
 
 import java.util.Enumeration;
+import java.util.concurrent.TimeUnit;
 
 /**
  * A helper class for working with JMS from inside collection classes
Index: lingo/src/main/java/org/logicblaze/lingo/jms/JmsQueue.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/jms/JmsQueue.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/jms/JmsQueue.java	(working copy)
@@ -17,9 +17,6 @@
  **/
 package org.logicblaze.lingo.jms;
 
-import edu.emory.mathcs.backport.java.util.concurrent.BlockingQueue;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.QueueBrowser;
@@ -32,6 +29,8 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 /**
  * An implementation of the Queue interface which maps to a JMS Destination.
@@ -41,7 +40,8 @@
  * 
  * @version $Revision$
  */
-public class JmsQueue extends AbstractCollection implements BlockingQueue {
+public class JmsQueue extends AbstractCollection implements BlockingQueue
+{
 
     private JmsClient jmsClient;
 
Index: lingo/src/main/java/org/logicblaze/lingo/jmx/remote/jms/MBeanJmsServerConnectionClient.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/jmx/remote/jms/MBeanJmsServerConnectionClient.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/jmx/remote/jms/MBeanJmsServerConnectionClient.java	(working copy)
@@ -14,9 +14,9 @@
  */
 package org.logicblaze.lingo.jmx.remote.jms;
 
-import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import javax.jms.Connection;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -25,7 +25,6 @@
 import javax.jms.ObjectMessage;
 import javax.jms.Session;
 import javax.jms.Topic;
-import javax.management.InstanceNotFoundException;
 import javax.management.ListenerNotFoundException;
 import javax.management.Notification;
 import javax.management.NotificationBroadcasterSupport;
@@ -35,7 +34,6 @@
 import org.apache.activemq.util.IdGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
 /**
  * @version $Revision$
  */
Index: lingo/src/main/java/org/logicblaze/lingo/jmx/remote/jms/JmsJmxConnector.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/jmx/remote/jms/JmsJmxConnector.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/jmx/remote/jms/JmsJmxConnector.java	(working copy)
@@ -17,6 +17,7 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -40,7 +41,6 @@
 import org.logicblaze.lingo.jms.JmsProducerConfig;
 import org.logicblaze.lingo.jms.JmsProxyFactoryBean;
 import org.logicblaze.lingo.jms.impl.MultiplexingRequestor;
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
 /**
  * <p>
  * The client end of a JMX API connector. An object of this type can be used to establish a connection to a connector
Index: lingo/src/main/java/org/logicblaze/lingo/jmx/remote/jms/MBeanJmsServerConnectionImpl.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/jmx/remote/jms/MBeanJmsServerConnectionImpl.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/jmx/remote/jms/MBeanJmsServerConnectionImpl.java	(working copy)
@@ -15,6 +15,7 @@
 package org.logicblaze.lingo.jmx.remote.jms;
 
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.jms.Connection;
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -23,7 +24,7 @@
 import javax.management.ObjectName;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+
 /**
  * @version $Revision$
  */
Index: lingo/src/main/java/org/logicblaze/lingo/util/ScheduledTask.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/util/ScheduledTask.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/util/ScheduledTask.java	(working copy)
@@ -17,12 +17,12 @@
  **/
 package org.logicblaze.lingo.util;
 
-import edu.emory.mathcs.backport.java.util.concurrent.ScheduledExecutorService;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
 /**
  * A simple POJO which is useful for wiring together tasks in an IoC type way.
  * 
Index: lingo/src/main/java/org/logicblaze/lingo/util/DefaultTimeoutMap.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/util/DefaultTimeoutMap.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/util/DefaultTimeoutMap.java	(working copy)
@@ -17,9 +17,6 @@
  **/
 package org.logicblaze.lingo.util;
 
-import edu.emory.mathcs.backport.java.util.concurrent.ScheduledExecutorService;
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -29,6 +26,8 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 
Index: lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionServerImpl.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionServerImpl.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionServerImpl.java	(working copy)
@@ -17,15 +17,15 @@
  **/
 package org.logicblaze.lingo.util.locks;
 
-import edu.emory.mathcs.backport.java.util.concurrent.ScheduledExecutorService;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantLock;
-
 import org.logicblaze.lingo.util.DefaultTimeoutMap;
 import org.logicblaze.lingo.util.ScheduledTask;
 import org.logicblaze.lingo.util.TimeoutMap;
 import org.logicblaze.lingo.util.TimeoutMapEntry;
 
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * A server side implementation of ConditionServer.
  * 
Index: lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionManagerImpl.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionManagerImpl.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionManagerImpl.java	(working copy)
@@ -17,12 +17,11 @@
  **/
 package org.logicblaze.lingo.util.locks;
 
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Condition;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantLock;
-
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Represents a client side {@link ConditionManager} which is used to
Index: lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionClient.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionClient.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionClient.java	(working copy)
@@ -17,18 +17,18 @@
  **/
 package org.logicblaze.lingo.util.locks;
 
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Condition;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock;
-
 import java.util.Date;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
 
 /**
  * Implements a client side proxy to a remote {@link Condition}
  * 
  * @version $Revision$
  */
-public class ConditionClient implements Condition {
+public class ConditionClient implements Condition
+{
 
     private ConditionServer server;
     private ConditionListener listener;
@@ -63,7 +63,13 @@
         }
     }
 
+    public long awaitNanos(long nanosTimeout) throws InterruptedException
+    {
+        throw new UnsupportedOperationException("awaitNanos");
+    }
+
     public void awaitUninterruptibly() {
+        throw new UnsupportedOperationException("awaitUninterruptibly");
     }
 
     public boolean await(long timeout, TimeUnit unit) throws InterruptedException {
Index: lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionController.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionController.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionController.java	(working copy)
@@ -17,11 +17,8 @@
  **/
 package org.logicblaze.lingo.util.locks;
 
-import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock;
-import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantLock;
-
 import java.util.LinkedList;
+import java.util.concurrent.locks.Lock;
 
 /**
  * A server side version of a {@link Condition} which is used by a
Index: lingo/src/main/java/org/logicblaze/lingo/util/locks/ConnectionManager.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/util/locks/ConnectionManager.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/util/locks/ConnectionManager.java	(working copy)
@@ -18,7 +18,7 @@
 
 package org.logicblaze.lingo.util.locks;
 
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Condition;
 
 /**
  * A manager of {@link Condition} objects.
Index: lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionFactory.java
===================================================================
--- lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionFactory.java	(revision 183)
+++ lingo/src/main/java/org/logicblaze/lingo/util/locks/ConditionFactory.java	(working copy)
@@ -17,7 +17,7 @@
  **/
 package org.logicblaze.lingo.util.locks;
 
-import edu.emory.mathcs.backport.java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Condition;
 
 /**
  * A Factory of {@link Condition instances}
Index: lingo/pom.xml
===================================================================
--- lingo/pom.xml	(revision 183)
+++ lingo/pom.xml	(working copy)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.logicblaze.lingo</groupId>
     <artifactId>lingo-parent</artifactId>
-    <version>1.3</version>
+    <version>1.3-jdk15</version>
   </parent>
 
   <repositories>
@@ -28,6 +28,7 @@
       <plugin>
         <groupId>org.apache.xbean</groupId>
         <artifactId>maven-xbean-plugin</artifactId>
+        <version>2.3</version>
         <executions>
           <execution>
             <configuration>
@@ -78,12 +79,6 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>backport-util-concurrent</groupId>
-      <artifactId>backport-util-concurrent</artifactId>
-      <version>2.1</version>
-      <optional>false</optional>
-    </dependency>
-    <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <version>1.7.3.3</version>
@@ -268,28 +263,15 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>incubator-activemq</groupId>
-      <artifactId>activeio-core</artifactId>
-      <version>3.0-beta3</version>
-      <scope>compile</scope>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-all</artifactId>
+      <version>5.2.0</version>
     </dependency>
     <dependency>
-      <groupId>incubator-activemq</groupId>
-      <artifactId>activemq-core</artifactId>
-      <version>4.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>incubator-activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-ra</artifactId>
-      <version>4.0</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>activemq</groupId>
-          <artifactId>jmdns</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>5.2.0</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>xstream</groupId>
@@ -412,4 +394,4 @@
     </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>
Index: lingo-cache/pom.xml
===================================================================
--- lingo-cache/pom.xml	(revision 183)
+++ lingo-cache/pom.xml	(working copy)
@@ -1,26 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.logicblaze.lingo</groupId>
-  <artifactId>lingo-cache</artifactId>
-  <description>Distributed JCache layer for Lingo</description>
-  <name>Lingo-Cache</name>
-  <parent>
-    <groupId>org.logicblaze.lingo</groupId>
-    <artifactId>lingo-parent</artifactId>
-    <version>1.3-SNAPSHOT</version>
-  </parent>
-  <dependencies>
-    <dependency>
-      <groupId>org.logicblaze.lingo</groupId>
-      <artifactId>lingo</artifactId>
-      <version>1.3-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>activespace</groupId>
-      <artifactId>jcache</artifactId>
-      <version>1.0-dev-3</version>
-    </dependency>
-  </dependencies>
-</project>
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.logicblaze.lingo</groupId>
+    <artifactId>lingo-cache</artifactId>
+    <description>Distributed JCache layer for Lingo</description>
+    <name>Lingo-Cache</name>
+    <parent>
+        <groupId>org.logicblaze.lingo</groupId>
+        <artifactId>lingo-parent</artifactId>
+        <version>1.3-jdk15</version>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.logicblaze.lingo</groupId>
+            <artifactId>lingo</artifactId>
+            <version>1.3-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>activespace</groupId>
+            <artifactId>jcache</artifactId>
+            <version>1.0-dev-3</version>
+        </dependency>
+    </dependencies>
+</project>
+
Index: pom.xml
===================================================================
--- pom.xml	(revision 183)
+++ pom.xml	(working copy)
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.logicblaze.lingo</groupId>
   <artifactId>lingo-parent</artifactId>
-  <version>1.3</version>
+  <version>1.3-jdk15</version>
   <name>Lingo-Parent</name>
   <packaging>pom</packaging>
 
@@ -66,7 +66,7 @@
       <id>activemq-tmp-repo</id>
       <name>ActiveMQ Maven2 Temp Repository</name>
       <url>
-        http://people.apache.org/~chirino/incubator-activemq-4.0/maven2
+        http://ftp.cica.es/mirrors/maven2/ 
       </url>
     </repository>
     <repository>
@@ -137,8 +137,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
+          <source>1.5</source>
+          <target>1.5</target>
         </configuration>
       </plugin>
       <plugin>
@@ -160,7 +160,8 @@
     </plugins>
 
   </build>
-  
+ 
+<dependencyManagement> 
   <dependencies>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -175,12 +176,6 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>backport-util-concurrent</groupId>
-      <artifactId>backport-util-concurrent</artifactId>
-      <version>2.1</version>
-      <optional>false</optional>
-    </dependency>
-    <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <version>1.7.3.3</version>
@@ -365,30 +360,6 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>incubator-activemq</groupId>
-      <artifactId>activeio-core</artifactId>
-      <version>3.0-beta3</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>incubator-activemq</groupId>
-      <artifactId>activemq-core</artifactId>
-      <version>4.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>incubator-activemq</groupId>
-      <artifactId>activemq-ra</artifactId>
-      <version>4.0</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>activemq</groupId>
-          <artifactId>jmdns</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>xstream</groupId>
       <artifactId>xstream</artifactId>
       <version>1.1.3</version>
@@ -427,5 +398,5 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-</project>
\ No newline at end of file
+ </dependencyManagement>
+</project>