Permalink
Browse files

pom.xml: update to base pom 0.1.10

Make sure not to pull an old version of Jackson from Hadoop.
Metrics requires 1.9.x.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
  • Loading branch information...
pierre committed May 2, 2012
1 parent 9759ab3 commit 60078097d23833c7c9de9592befe1ed91dcfd5c5
View
30 pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>com.ning</groupId>
<artifactId>metrics.base-pom</artifactId>
- <version>0.0.21</version>
+ <version>0.1.10</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.ning</groupId>
@@ -144,6 +144,17 @@
<groupId>com.ning</groupId>
<artifactId>metrics.serialization-hadoop</artifactId>
<version>2.2.1</version>
+ <exclusions>
+ <!-- Hadoop ships with jackson 1.4.2 for its servlets - we don't need it -->
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.ning</groupId>
@@ -267,6 +278,23 @@
<dependency>
<groupId>org.atmosphere</groupId>
<artifactId>atmosphere-jersey</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.atmosphere</groupId>
+ <artifactId>atmosphere-ping</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- Set the jackson version for transitive dependencies -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.9.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.9.5</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -19,7 +19,6 @@
import com.google.inject.Inject;
import com.ning.metrics.collector.binder.config.CollectorConfig;
import com.ning.metrics.collector.realtime.EventListenerDispatcher;
-import com.ning.metrics.collector.realtime.EventsLogger;
import com.ning.metrics.collector.realtime.NewEventListener;
import com.sun.jersey.api.view.Viewable;
import org.atmosphere.cpr.Broadcaster;
@@ -80,7 +79,6 @@ public SuspendResponse subscribe(@PathParam("type") @DefaultValue(EventListenerD
.broadcaster(broadcaster)
.resumeOnBroadcast(false)
.outputComments(true)
- .addListener(new EventsLogger())
.build();
}
}
@@ -1,64 +0,0 @@
-/*
- * Copyright 2010-2011 Ning, Inc.
- *
- * Ning licenses this file to you under the Apache License, version 2.0
- * (the "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package com.ning.metrics.collector.realtime;
-
-import org.atmosphere.cpr.AtmosphereResourceEvent;
-import org.atmosphere.cpr.AtmosphereResourceEventListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class EventsLogger implements AtmosphereResourceEventListener
-{
- private static final Logger log = LoggerFactory.getLogger(EventsLogger.class);
-
- @Override
- public void onSuspend(final AtmosphereResourceEvent<HttpServletRequest, HttpServletResponse> event)
- {
- log.debug("onSuspend(): {}:{}", event.getResource().getRequest().getRemoteAddr(), event.getResource().getRequest().getRemotePort());
- }
-
- @Override
- public void onResume(final AtmosphereResourceEvent<HttpServletRequest, HttpServletResponse> event)
- {
- log.debug("onResume(): {}:{}", event.getResource().getRequest().getRemoteAddr(),
- event.getResource().getRequest().getRemotePort());
- }
-
- @Override
- public void onDisconnect(final AtmosphereResourceEvent<HttpServletRequest, HttpServletResponse> event)
- {
- log.debug("onDisconnect(): {}:{}", event.getResource().getRequest().getRemoteAddr(),
- event.getResource().getRequest().getRemotePort());
- }
-
- @Override
- public void onBroadcast(final AtmosphereResourceEvent<HttpServletRequest, HttpServletResponse> event)
- {
- log.debug("onBroadcast(): {}:{}", event.getResource().getRequest().getRemoteAddr(),
- event.getResource().getRequest().getRemotePort());
- }
-
- @Override
- public void onThrowable(final AtmosphereResourceEvent<HttpServletRequest, HttpServletResponse> event)
- {
- log.debug("onThrowable(): {}:{}", event.getResource().getRequest().getRemoteAddr(),
- event.getResource().getRequest().getRemotePort());
- }
-}

0 comments on commit 6007809

Please sign in to comment.