diff --git a/.gitignore b/.gitignore
index daef0eb..fccb85f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,10 @@ buildNumber.properties
 # IntelliJ IdeaIU
 .idea/
 *.iml
+# Apache ActiveMQ
+ActiveMQConnections.dot
+activemq-data/
+/data/
+/activemq-core/derbydb/
+/activemq-core/testJdbcConfig/
+/activemq-core/derby.log
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index 6b9e7df..f4e2ce7 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-console</artifactId>
@@ -37,16 +37,16 @@
   <dependencies>
     <!-- activemq related dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
         
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 1c924c3..a60316e 100644
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-core</artifactId>
@@ -50,7 +50,7 @@
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
       <optional>false</optional>
     </dependency>
@@ -172,9 +172,7 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>pertest</forkMode>
-          <childDelegation>false</childDelegation>
-          <useFile>true</useFile>
+          <reuseForks>false</reuseForks>
           <argLine>-Xmx512M</argLine>
           <includes>
             <include>**/*Test.*</include>
diff --git a/activemq-core/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java b/activemq-core/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
index d5165cf..97c3ff0 100644
--- a/activemq-core/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
@@ -30,28 +30,21 @@
  * @version $Revision: 467693 $
  */
 public class BrokerXmlConfigFromJNDITest extends JmsTopicSendReceiveWithTwoConnectionsTest {
+
     protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
-        // START SNIPPET: example
 
-        
-//        System.err.print(System.getProperties());
-        
-        // we could put these properties into a jndi.properties
-        // on the classpath instead
-        Hashtable properties = new Hashtable();
+        final Hashtable<String, String> properties = new Hashtable<>();
         properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
 
         // configure the embedded broker using an XML config file
         // which is either a URL or a resource on the classpath
         
-        File f = new File(System.getProperty("basedir", "."));
-        properties.put(Context.PROVIDER_URL, "vm://localhost?brokerConfig=xbean:file:"+f+"/src/test/resources/activemq.xml");
+        final String providerUrl = "vm://localhost?brokerConfig=xbean:classpath:activemq.xml";
+        properties.put(Context.PROVIDER_URL, providerUrl);
 
-        InitialContext context = new InitialContext(properties);
-        ActiveMQConnectionFactory connectionFactory = (ActiveMQConnectionFactory) context.lookup("ConnectionFactory");
+        final InitialContext context = new InitialContext(properties);
+        return (ActiveMQConnectionFactory) context.lookup("ConnectionFactory");
 
-        // END SNIPPET: example
-        return connectionFactory;
     }
 
 }
diff --git a/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java b/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
index 6163f58..85343b0 100644
--- a/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
+++ b/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
@@ -75,10 +75,12 @@ public class ConfigTest extends TestCase {
      */
 
     /*
-     * This tests creating a journal persistence adapter using the persistence adapter factory bean
+     * This test creates a journal persistence adapter using the persistence adapter factory bean.
      */
     public void testJournaledJDBCConfig() throws Exception {
-//        System.out.print("Checking journaled JDBC persistence adapter configuration... ");
+
+        if (log.isDebugEnabled())
+            log.debug("testJournaledJDBCConfig() start");
 
         File journalFile = new File(JOURNAL_ROOT + "testJournaledJDBCConfig/journal");
         recursiveDelete(journalFile);
@@ -98,16 +100,17 @@ public void testJournaledJDBCConfig() throws Exception {
             assertTrue("Should have created a journal directory at " + journalFile.getAbsolutePath(), journalFile.exists());
 
             
-            // Check persistence factory configurations
-//            System.out.print("Checking persistence adapter factory settings... ");
+            // TODO Check persistence factory configurations
             JournalPersistenceAdapter pa = (JournalPersistenceAdapter) broker.getPersistenceAdapter();
-            
+
             log.info("Success");
         } finally {
             if (broker != null) {
                 broker.stop();
             }
         }
+        if (log.isDebugEnabled())
+            log.debug("testJournaledJDBCConfig() end");
     }
 
     /*
diff --git a/activemq-core/src/test/resources/log4j.properties b/activemq-core/src/test/resources/log4j.properties
index 3f12e67..fa9f971 100644
--- a/activemq-core/src/test/resources/log4j.properties
+++ b/activemq-core/src/test/resources/log4j.properties
@@ -16,11 +16,12 @@
 ## ---------------------------------------------------------------------------
 
 #
-# The logging properties used during tests..
+# The logging properties used during tests ...
 #
 log4j.rootLogger=INFO, out
 
 log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest=DEBUG
 
 # CONSOLE appender not used by default
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml b/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
index 92a0221..92f6a48 100644
--- a/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
+++ b/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
@@ -1,4 +1,4 @@
-???<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index 075a884..3d15ae2 100644
--- a/activemq-jaas/pom.xml
+++ b/activemq-jaas/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-jaas</artifactId>
diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml
index 54ca7fb..e0a5dfc 100644
--- a/activemq-openwire-generator/pom.xml
+++ b/activemq-openwire-generator/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
index 58942fc..4b41e86 100644
--- a/activemq-optional/pom.xml
+++ b/activemq-optional/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-optional</artifactId>
@@ -37,17 +37,17 @@
   <dependencies>
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>    
     
@@ -95,8 +95,9 @@
     </dependency>
     
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>compile</scope>
     </dependency>
 
     <dependency>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 72aab90..22b0a76 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-ra</artifactId>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index 220bd6d..b088233 100644
--- a/activemq-rar/pom.xml
+++ b/activemq-rar/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-rar</artifactId>
@@ -39,7 +39,7 @@
   
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-ra</artifactId>
       <exclusions>
         <exclusion>
@@ -83,7 +83,7 @@
            <artifactId>axion</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>${pom.groupId}</groupId>
+           <groupId>${project.groupId}</groupId>
            <artifactId>activemq-jaas</artifactId>
         </exclusion>
         <exclusion>
diff --git a/activemq-repository-builder/pom.xml b/activemq-repository-builder/pom.xml
index 6c8c779..f42e10a 100644
--- a/activemq-repository-builder/pom.xml
+++ b/activemq-repository-builder/pom.xml
@@ -35,7 +35,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>org.apache.activemq</artifactId>
     </dependency>
   </dependencies>
diff --git a/activemq-soaktest/project.xml b/activemq-soaktest/project.xml
index 3a4f54c..3c22764 100644
--- a/activemq-soaktest/project.xml
+++ b/activemq-soaktest/project.xml
@@ -30,7 +30,7 @@
   <dependencies>
 
       <dependency>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>activemq-core</artifactId>
         <version>${pom.currentVersion}</version>
         <properties>
@@ -40,7 +40,7 @@
       </dependency>
 
       <dependency>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>activeio-core</artifactId>
         <version>${activeio_version}</version>
         <properties>
@@ -50,7 +50,7 @@
       </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core-test</artifactId>
       <version>${pom.currentVersion}</version>
     </dependency>
diff --git a/activemq-systest/project.xml b/activemq-systest/project.xml
index e09984b..2e8d79b 100644
--- a/activemq-systest/project.xml
+++ b/activemq-systest/project.xml
@@ -56,7 +56,7 @@
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <version>${pom.currentVersion}</version>
       <properties>
@@ -91,7 +91,7 @@
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
       <version>${activeio_version}</version>
       <properties>
diff --git a/activemq-test-atomikos/pom.xml b/activemq-test-atomikos/pom.xml
index a5194a3..a0ec60d 100644
--- a/activemq-test-atomikos/pom.xml
+++ b/activemq-test-atomikos/pom.xml
@@ -27,13 +27,17 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-test-atomikos</artifactId>
   <packaging>jar</packaging>
   <name>ActiveMQ :: Atomikos System Test</name>
 
+  <properties>
+    <atomikos.version>3.2.3</atomikos.version>
+  </properties>
+
   <repositories>
     <!-- for the Atomikos jars -->
     <repository>
@@ -51,17 +55,17 @@
   <dependencies>
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <scope>compile</scope>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
     <dependency>
@@ -73,22 +77,22 @@
     <dependency>
       <groupId>com.atomikos</groupId>
       <artifactId>transactions</artifactId>
-      <version>3.1.0</version>
+      <version>${atomikos.version}</version>
     </dependency>
     <dependency>
       <groupId>com.atomikos</groupId>
       <artifactId>transactions-api</artifactId>
-      <version>3.1.0</version>
+      <version>${atomikos.version}</version>
     </dependency>
     <dependency>
       <groupId>com.atomikos</groupId>
       <artifactId>transactions-jta</artifactId>
-      <version>3.1.0</version>
+      <version>${atomikos.version}</version>
     </dependency>
     <dependency>
       <groupId>com.atomikos</groupId>
       <artifactId>atomikos-util</artifactId>
-      <version>3.1.0</version>
+      <version>${atomikos.version}</version>
     </dependency>
 
     <dependency>
diff --git a/activemq-tooling/maven-activemq-memtest-plugin/pom.xml b/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
index ded6f42..f467b39 100644
--- a/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
+++ b/activemq-tooling/maven-activemq-memtest-plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.activemq.tooling</groupId>
         <artifactId>activemq-tooling</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.1-j8</version>
 	</parent>
     
 	<artifactId>maven-activemq-memtest-plugin</artifactId>
diff --git a/activemq-tooling/maven-activemq-perf-plugin/pom.xml b/activemq-tooling/maven-activemq-perf-plugin/pom.xml
index cc28d03..33c75b8 100644
--- a/activemq-tooling/maven-activemq-perf-plugin/pom.xml
+++ b/activemq-tooling/maven-activemq-perf-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.activemq.tooling</groupId>
         <artifactId>activemq-tooling</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.1-j8</version>
 	</parent>
 
     <artifactId>maven-activemq-perf-plugin</artifactId>
diff --git a/activemq-tooling/maven-activemq-plugin/pom.xml b/activemq-tooling/maven-activemq-plugin/pom.xml
index 7d99f6a..89a8ea4 100644
--- a/activemq-tooling/maven-activemq-plugin/pom.xml
+++ b/activemq-tooling/maven-activemq-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.activemq.tooling</groupId>
         <artifactId>activemq-tooling</artifactId>
-        <version>4.1.1</version>
+        <version>4.1.1-j8</version>
 	</parent>
     
 	<artifactId>maven-activemq-plugin</artifactId>
diff --git a/activemq-tooling/pom.xml b/activemq-tooling/pom.xml
index 49c60da..f087c6b 100644
--- a/activemq-tooling/pom.xml
+++ b/activemq-tooling/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <groupId>org.apache.activemq.tooling</groupId>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 32012d4..1c9e43e 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-web-console</artifactId>
@@ -95,29 +95,29 @@
 
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
     </dependency>
 
     <!-- XMPP support -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-xmpp</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <!-- TODO this should not be needed, but transitive dependencies are not working -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
     <dependency>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 3ea1446..4e60034 100644
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-web-demo</artifactId>
@@ -74,17 +74,17 @@
 
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
     </dependency>
 
     <!-- TODO this should not be needed, but transitive dependencies are not working -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
     <dependency>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index c20b817..d60b26d 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-web</artifactId>
@@ -38,11 +38,11 @@
   <dependencies>
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
diff --git a/activemq-xmpp/pom.xml b/activemq-xmpp/pom.xml
index f64f77b..5446367 100644
--- a/activemq-xmpp/pom.xml
+++ b/activemq-xmpp/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>activemq-xmpp</artifactId>
@@ -68,19 +68,19 @@
   <dependencies>
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <!--
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <scope>compile</scope>
       <type>test-jar</type>
     </dependency>
     -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
 
@@ -167,16 +167,6 @@
 
     <plugins>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6c87590..3cbec56 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>4.1.1</version>
+    <version>4.1.1-j8</version>
   </parent>
 
   <artifactId>apache-activemq</artifactId>
@@ -45,41 +45,41 @@
     
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-optional</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-jaas</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web-demo</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-rar</artifactId>
       <type>rar</type>
       <optional>true</optional>
@@ -266,7 +266,7 @@
           </includes>
         </configuration>
       </plugin>
-      <plugin>
+      <!-- plugin>
         <groupId>org.apache.activemq</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>4.1-incubator</version>
@@ -281,7 +281,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
+      </plugin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -297,7 +297,7 @@
               <descriptors>
                  <descriptor>src/main/descriptors/unix-bin.xml</descriptor>  
               </descriptors>
-              <finalName>${pom.artifactId}-${pom.version}</finalName>
+              <finalName>${project.artifactId}-${project.version}</finalName>
               <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </execution>
@@ -311,7 +311,7 @@
               <descriptors>
                  <descriptor>src/main/descriptors/windows-bin.xml</descriptor>  
               </descriptors>
-              <finalName>${pom.artifactId}-${pom.version}</finalName>
+              <finalName>${project.artifactId}-${project.version}</finalName>
               <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </execution>
@@ -344,7 +344,7 @@
       <!-- plugin>
         <groupId>org.apache.activemq</groupId>
         <artifactId>maven-activemq-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <configuration>
           <configFile>${basedir}/src/release/conf/activemq.xml</configFile>
           <url>broker:(tcp://localhost:61616)?useJmx=false</url>
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
index 6c15f3d..67cf355 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -93,7 +93,7 @@
       <directory>target</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>${pom.artifactId}-${pom.version}.jar</include>
+        <include>${project.artifactId}-${project.version}.jar</include>
       </includes>
     </fileSet>
     <fileSet>
@@ -113,14 +113,14 @@
          <include>backport-util-concurrent:backport-util-concurrent</include>
          <include>commons-logging:commons-logging</include>
          <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
-         <include>${pom.groupId}:activemq-core</include>
-         <include>${pom.groupId}:activeio-core</include>
-         <include>${pom.groupId}:activemq-console</include>         
-         <include>${pom.groupId}:activemq-jaas</include>
+         <include>${project.groupId}:activemq-core</include>
+         <include>${project.groupId}:activeio-core</include>
+         <include>${project.groupId}:activemq-console</include>
+         <include>${project.groupId}:activemq-jaas</include>
          <include>mx4j:mx4j</include>         
          <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
          <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-         <include>${pom.groupId}:activemq-web</include>
+         <include>${project.groupId}:activemq-web</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -128,9 +128,9 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-         <include>${pom.groupId}:activemq-rar</include>
-         <include>${pom.groupId}:activemq-optional</include>
-         <include>${pom.groupId}:activecluster</include>
+         <include>${project.groupId}:activemq-rar</include>
+         <include>${project.groupId}:activemq-optional</include>
+         <include>${project.groupId}:activecluster</include>
          <include>commons-beanutils:commons-beanutils</include>
          <include>commons-collections:commons-collections</include>
          <include>commons-httpclient:commons-httpclient</include>
diff --git a/assembly/src/main/descriptors/windows-bin.xml b/assembly/src/main/descriptors/windows-bin.xml
index eeab90f..7e8df6c 100644
--- a/assembly/src/main/descriptors/windows-bin.xml
+++ b/assembly/src/main/descriptors/windows-bin.xml
@@ -65,7 +65,7 @@
       <directory>target</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>${pom.artifactId}-${pom.version}.jar</include>
+        <include>${project.artifactId}-${project.version}.jar</include>
       </includes>
     </fileSet>
     <fileSet>
@@ -85,14 +85,14 @@
          <include>backport-util-concurrent:backport-util-concurrent</include>
          <include>commons-logging:commons-logging</include>
          <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
-         <include>${pom.groupId}:activemq-core</include>
-         <include>${pom.groupId}:activeio-core</include>
-         <include>${pom.groupId}:activemq-console</include>         
-         <include>${pom.groupId}:activemq-jaas</include>
+         <include>${project.groupId}:activemq-core</include>
+         <include>${project.groupId}:activeio-core</include>
+         <include>${project.groupId}:activemq-console</include>
+         <include>${project.groupId}:activemq-jaas</include>
          <include>mx4j:mx4j</include>         
          <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
          <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-         <include>${pom.groupId}:activemq-web</include>
+         <include>${project.groupId}:activemq-web</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -100,9 +100,9 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-         <include>${pom.groupId}:activemq-rar</include>
-         <include>${pom.groupId}:activemq-optional</include>
-         <include>${pom.groupId}:activecluster</include>
+         <include>${project.groupId}:activemq-rar</include>
+         <include>${project.groupId}:activemq-optional</include>
+         <include>${project.groupId}:activecluster</include>
          <include>commons-beanutils:commons-beanutils</include>
          <include>commons-collections:commons-collections</include>
          <include>commons-httpclient:commons-httpclient</include>
diff --git a/pom.xml b/pom.xml
index 439cd11..5330bee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>activemq-parent</artifactId>
-  <version>4.1.1</version>
+  <version>4.1.1-j8</version>
   <packaging>pom</packaging>
   <name>ActiveMQ</name>
 
@@ -216,7 +216,7 @@
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activeio-core</artifactId>
-        <version>3.0.0-incubator</version>
+        <version>3.1.4</version>
       </dependency>
 	  <dependency>
         <groupId>org.apache.activemq</groupId>
@@ -779,7 +779,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>${org-apache-maven-surefire-plugin-version}</version>
+          <version>3.0.0-M5</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -799,6 +799,11 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.1</version>
+          <configuration>
+            <source>8</source>
+            <target>8</target>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -842,18 +847,9 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${org-apache-maven-surefire-plugin-version}</version>
         <configuration>
           <forkMode>once</forkMode>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
@@ -926,7 +922,7 @@
   </reporting>
 
   <properties>
-    <activemq-version>4.1.1</activemq-version>
+    <activemq-version>4.1.1-j8</activemq-version>
     <activesoap-version>1.3</activesoap-version>
     <annogen-version>0.1.0</annogen-version>
     <ant-version>1.6.2</ant-version>
@@ -958,7 +954,6 @@
     <mx4j-version>2.1.1</mx4j-version>
     <org-apache-derby-version>10.1.1.0</org-apache-derby-version>
     <org-apache-geronimo-specs-version>1.0</org-apache-geronimo-specs-version>
-    <org-apache-maven-surefire-plugin-version>2.2</org-apache-maven-surefire-plugin-version>
     <p2psockets-version>1.1.2</p2psockets-version>
     <regexp-version>1.3</regexp-version>
     <rome-version>0.8</rome-version>
@@ -971,5 +966,6 @@
     <dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</dist-repo-url>
     <m1-dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>
     <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 </project>