activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AMQ-5105 - problem starting broker with leveldb store
Date Thu, 17 Jul 2014 15:13:02 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk 4d4766e3a -> 4da588d4f


https://issues.apache.org/jira/browse/AMQ-5105 - problem starting broker with leveldb store


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4da588d4
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4da588d4
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4da588d4

Branch: refs/heads/trunk
Commit: 4da588d4fcc65dd8d31f751746b8ef42d86aad1b
Parents: 4d4766e
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Thu Jul 17 17:12:25 2014 +0200
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Thu Jul 17 17:12:52 2014 +0200

----------------------------------------------------------------------
 activemq-console/pom.xml                        |  14 ++++++-----
 .../console/command/store/StoreExporter.java    |   2 +-
 activemq-leveldb-store/pom.xml                  |  14 ++++++-----
 .../leveldb/replicated/dto/LogDelete.java       |   2 +-
 .../leveldb/replicated/dto/LogWrite.java        |   2 +-
 .../activemq/leveldb/replicated/dto/Login.java  |   2 +-
 .../leveldb/replicated/dto/Transfer.java        |   2 +-
 .../activemq/leveldb/replicated/dto/WalAck.java |   2 +-
 .../leveldb/replicated/MasterElector.scala      |   2 +-
 .../replicated/groups/ClusteredSingleton.scala  |   4 ++--
 .../activemq/leveldb/util/JsonCodec.scala       |   2 +-
 activemq-partition/pom.xml                      |  14 ++++++-----
 .../activemq/partition/dto/Partitioning.java    |  24 +++++++++++--------
 .../apache/activemq/partition/dto/Target.java   |   2 +-
 assembly/pom.xml                                |  16 +++++++++++--
 assembly/src/main/descriptors/common-bin.xml    |  11 ++++-----
 .../insight-log4j-7.2.0.redhat-024-patched.jar  | Bin 20044 -> 0 bytes
 assembly/src/release/conf/activemq.xml          |   2 +-
 pom.xml                                         |  20 ++++++++++++++--
 19 files changed, 87 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-console/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index d7e5b2e..6265b0f 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -79,14 +79,16 @@
       <version>${hawtbuf-version}</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <version>${jackson-version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>${jackson-version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-console/src/main/java/org/apache/activemq/console/command/store/StoreExporter.java
----------------------------------------------------------------------
diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/store/StoreExporter.java
b/activemq-console/src/main/java/org/apache/activemq/console/command/store/StoreExporter.java
index e41a377..e9a5efe 100644
--- a/activemq-console/src/main/java/org/apache/activemq/console/command/store/StoreExporter.java
+++ b/activemq-console/src/main/java/org/apache/activemq/console/command/store/StoreExporter.java
@@ -43,7 +43,7 @@ import org.apache.activemq.store.MessageStore;
 import org.apache.activemq.store.PersistenceAdapter;
 import org.apache.activemq.store.TopicMessageStore;
 import org.apache.activemq.store.TransactionRecoveryListener;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.fusesource.hawtbuf.AsciiBuffer;
 import org.fusesource.hawtbuf.DataByteArrayOutputStream;
 import org.fusesource.hawtbuf.UTF8Buffer;

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-leveldb-store/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index 764f3c4..c23d653 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -165,14 +165,16 @@
       <version>0.2</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <version>${jackson-version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>${jackson-version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/LogDelete.java
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/LogDelete.java
b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/LogDelete.java
index 6c44e69..9500eec 100644
--- a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/LogDelete.java
+++ b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/LogDelete.java
@@ -17,7 +17,7 @@
 
 package org.apache.activemq.leveldb.replicated.dto;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/LogWrite.java
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/LogWrite.java
b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/LogWrite.java
index b3749bb..e2a3182 100644
--- a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/LogWrite.java
+++ b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/LogWrite.java
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.leveldb.replicated.dto;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/Login.java
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/Login.java
b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/Login.java
index 9fc26eb..0d9fedc 100644
--- a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/Login.java
+++ b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/Login.java
@@ -17,7 +17,7 @@
 
 package org.apache.activemq.leveldb.replicated.dto;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/Transfer.java
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/Transfer.java
b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/Transfer.java
index de6e20c..e69a875 100644
--- a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/Transfer.java
+++ b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/Transfer.java
@@ -17,7 +17,7 @@
 
 package org.apache.activemq.leveldb.replicated.dto;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/WalAck.java
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/WalAck.java
b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/WalAck.java
index a2a940e..55038f4 100644
--- a/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/WalAck.java
+++ b/activemq-leveldb-store/src/main/java/org/apache/activemq/leveldb/replicated/dto/WalAck.java
@@ -17,7 +17,7 @@
 
 package org.apache.activemq.leveldb.replicated.dto;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterElector.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterElector.scala
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterElector.scala
index 216e7cd..8400e33 100644
--- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterElector.scala
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterElector.scala
@@ -17,7 +17,7 @@
 package org.apache.activemq.leveldb.replicated
 
 import org.apache.activemq.leveldb.replicated.groups._
-import org.codehaus.jackson.annotate.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 import org.apache.activemq.leveldb.util.{Log, JsonCodec}
 import java.io.IOException
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala
index 0a03811..a1a5250 100644
--- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/groups/ClusteredSingleton.scala
@@ -20,12 +20,12 @@ package org.apache.activemq.leveldb.replicated.groups
 import collection.mutable.{ListBuffer, HashMap}
 
 import java.io._
-import org.codehaus.jackson.map.ObjectMapper
+import com.fasterxml.jackson.databind.ObjectMapper
 import collection.JavaConversions._
 import java.util.LinkedHashMap
 import java.lang.{IllegalStateException, String}
 import beans.BeanProperty
-import org.codehaus.jackson.annotate.JsonProperty
+import com.fasterxml.jackson.annotation.JsonProperty
 import org.apache.zookeeper.KeeperException.NoNodeException
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/JsonCodec.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/JsonCodec.scala
b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/JsonCodec.scala
index c7640a1..11b209b 100644
--- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/JsonCodec.scala
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/util/JsonCodec.scala
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.leveldb.util
 
-import org.codehaus.jackson.map.ObjectMapper
+import com.fasterxml.jackson.databind.ObjectMapper
 import org.fusesource.hawtbuf.{ByteArrayOutputStream, Buffer}
 import java.io.InputStream
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-partition/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-partition/pom.xml b/activemq-partition/pom.xml
index 8a88fda..c0ec8bc 100644
--- a/activemq-partition/pom.xml
+++ b/activemq-partition/pom.xml
@@ -67,14 +67,16 @@
 
     <!-- For Optional Snappy Compression -->
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <version>${jackson-version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>${jackson-version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
     </dependency>
 
     <!-- Testing Dependencies -->

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Partitioning.java
----------------------------------------------------------------------
diff --git a/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Partitioning.java
b/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Partitioning.java
index 8c339b4..43f7924 100644
--- a/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Partitioning.java
+++ b/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Partitioning.java
@@ -16,12 +16,16 @@
  */
 package org.apache.activemq.partition.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.codehaus.jackson.map.annotate.JsonDeserialize;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.DeserializationConfig;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -33,14 +37,14 @@ public class Partitioning {
 
     static final public ObjectMapper MAPPER = new ObjectMapper();
     static {
-        MAPPER.setSerializationInclusion(JsonSerialize.Inclusion.NON_NULL);
-        MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
+        MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     }
 
     static final public ObjectMapper TO_STRING_MAPPER = new ObjectMapper();
     static {
-        TO_STRING_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
-        TO_STRING_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
+        TO_STRING_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+        TO_STRING_MAPPER.enable(SerializationFeature.INDENT_OUTPUT);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Target.java
----------------------------------------------------------------------
diff --git a/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Target.java
b/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Target.java
index 102f4ff..79b53ef 100644
--- a/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Target.java
+++ b/activemq-partition/src/main/java/org/apache/activemq/partition/dto/Target.java
@@ -16,7 +16,7 @@
  */
 package org.apache.activemq.partition.dto;
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.IOException;
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4700be0..06cf3e4 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -410,12 +410,12 @@
       <version>${json-simple-version}</version>
     </dependency>
     <dependency>
-      <groupId>org.fusesource.insight</groupId>
+      <groupId>io.fabric8.insight</groupId>
       <artifactId>insight-log-core</artifactId>
       <version>${insight-version}</version>
     </dependency>
     <dependency>
-      <groupId>org.fusesource.insight</groupId>
+      <groupId>io.fabric8.insight</groupId>
       <artifactId>insight-log4j</artifactId>
       <version>${insight-version}</version>
     </dependency>
@@ -429,6 +429,18 @@
       <artifactId>proton-j</artifactId>
       <version>${qpid-proton-version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/assembly/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 862ddc4..be54966 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -138,13 +138,8 @@
         <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
         <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
         <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
-        <include>org.ops4j.pax.url:pax-url-aether</include>
         <include>${pom.groupId}:activemq-web</include>
         <include>org.fusesource.hawtbuf:hawtbuf</include>
-        <include>org.fusesource.insight:insight-log-core</include>
-        <!-- TODO: we use a patched insight-log4j AR from assembly/src/release/lib until
a new release is out
-        <include>org.fusesource.insight:insight-log4j</include>
-        -->
       </includes>
     </dependencySet>
     <dependencySet>
@@ -220,15 +215,19 @@
         <include>org.fusesource.hawtjni:hawtjni-runtime</include>
         <include>org.xerial.snappy:*</include>
         <include>org.iq80.snappy:*</include>
-        <include>org.codehaus.jackson:*</include>
         <include>org.linkedin:org.linkedin.zookeeper-impl</include>
         <include>org.linkedin:org.linkedin.util-core</include>
         <include>org.apache.zookeeper:zookeeper</include>
+        <include>com.fasterxml.jackson.core:*</include>
 
         <!-- Apache Shiro dependencies: -->
         <include>org.apache.shiro:shiro-core</include>
         <include>org.apache.shiro:shiro-spring</include>
 
+        <!-- insight log -->
+        <include>io.fabric8.insight:insight-log-core</include>
+        <include>io.fabric8.insight:insight-log4j</include>
+
       </includes>
     </dependencySet>
     <dependencySet>

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/assembly/src/patch/insight-log4j-7.2.0.redhat-024-patched.jar
----------------------------------------------------------------------
diff --git a/assembly/src/patch/insight-log4j-7.2.0.redhat-024-patched.jar b/assembly/src/patch/insight-log4j-7.2.0.redhat-024-patched.jar
deleted file mode 100644
index 58e4101..0000000
Binary files a/assembly/src/patch/insight-log4j-7.2.0.redhat-024-patched.jar and /dev/null
differ

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/assembly/src/release/conf/activemq.xml
----------------------------------------------------------------------
diff --git a/assembly/src/release/conf/activemq.xml b/assembly/src/release/conf/activemq.xml
index 8fce295..6c56f38 100755
--- a/assembly/src/release/conf/activemq.xml
+++ b/assembly/src/release/conf/activemq.xml
@@ -29,7 +29,7 @@
     </bean>
 
    <!-- Allows accessing the server log -->
-    <bean id="logQuery" class="org.fusesource.insight.log.log4j.Log4jLogQuery"
+    <bean id="logQuery" class="io.fabric8.insight.log.log4j.Log4jLogQuery"
           lazy-init="false" scope="singleton"
           init-method="start" destroy-method="stop">
     </bean>

http://git-wip-us.apache.org/repos/asf/activemq/blob/4da588d4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 33b0597..57968c0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -69,8 +69,8 @@
     <hsqldb-version>1.8.0.12</hsqldb-version>
     <httpclient-version>4.2.5</httpclient-version>
     <httpcore-version>4.2.4</httpcore-version>
-    <insight-version>7.2.0.redhat-024</insight-version>
-    <jackson-version>1.9.12</jackson-version>
+    <insight-version>1.1.0.CR3</insight-version>
+    <jackson-version>2.4.1</jackson-version>
     <jasypt-version>1.9.2</jasypt-version>
     <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version>
     <jdom-version>1.0</jdom-version>
@@ -647,6 +647,22 @@
 
       </dependency>
 
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>${jackson-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>${jackson-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${jackson-version}</version>
+      </dependency>
+
       <!-- Used to configure the activemq logs -->
       <dependency>
         <groupId>log4j</groupId>


Mime
View raw message