Skip to content
This repository has been archived by the owner on Sep 29, 2021. It is now read-only.

Commit

Permalink
Fix imports and pom.xml files
Browse files Browse the repository at this point in the history
  • Loading branch information
Drew Csillag committed Oct 2, 2014
1 parent bd52966 commit 590780d
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 35 deletions.
2 changes: 1 addition & 1 deletion helios-client/pom.xml
View file
Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
10 changes: 5 additions & 5 deletions helios-services/pom.xml
View file
Expand Up @@ -19,9 +19,9 @@
</dependency>
<!--compile deps -->
<dependency>
<groupId>com.yammer.dropwizard</groupId>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<version>0.6.2</version>
<version>0.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
Expand Down Expand Up @@ -95,12 +95,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down Expand Up @@ -130,7 +130,7 @@
<dependency>
<groupId>net.sourceforge.argparse4j</groupId>
<artifactId>argparse4j</artifactId>
<version>0.4.1</version>
<version>0.4.3</version>
</dependency>
<dependency>
<groupId>com.readytalk</groupId>
Expand Down
2 changes: 1 addition & 1 deletion helios-services/src/main/java/com/spotify/helios/agent/AgentModelTaskResource.java
View file
Expand Up @@ -23,7 +23,7 @@

import com.spotify.helios.common.descriptors.JobId;
import com.spotify.helios.common.descriptors.Task;
import com.yammer.metrics.annotation.Timed;
import com.codahale.metrics.annotation.Timed;

import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion helios-services/src/main/java/com/spotify/helios/agent/AgentModelTaskStatusResource.java
View file
Expand Up @@ -23,7 +23,7 @@

import com.spotify.helios.common.descriptors.JobId;
import com.spotify.helios.common.descriptors.TaskStatus;
import com.yammer.metrics.annotation.Timed;
import com.codahale.metrics.annotation.Timed;

import java.util.Map;

Expand Down
7 changes: 4 additions & 3 deletions helios-services/src/main/java/com/spotify/helios/agent/DockerHealthChecker.java
View file
Expand Up @@ -26,8 +26,9 @@
import com.spotify.helios.servicescommon.RiemannFacade;
import com.spotify.helios.servicescommon.statistics.MeterRates;
import com.spotify.helios.servicescommon.statistics.SupervisorMetrics;
import com.yammer.dropwizard.lifecycle.Managed;
import com.yammer.metrics.core.HealthCheck;
import com.codahale.metrics.health.HealthCheck;

import io.dropwizard.lifecycle.Managed;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -59,7 +60,7 @@ public class DockerHealthChecker extends HealthCheck implements Managed {
public DockerHealthChecker(final SupervisorMetrics metrics,
final TimeUnit timeUnit, int interval,
final RiemannFacade facade) {
super("docker");
super();
this.metrics = checkNotNull(metrics);
this.timeUnit = checkNotNull(timeUnit);
this.facade = checkNotNull(facade).stack("docker-health");
Expand Down
4 changes: 2 additions & 2 deletions helios-services/src/main/java/com/spotify/helios/master/resources/HistoryResource.java
View file
Expand Up @@ -30,8 +30,8 @@
import com.spotify.helios.master.JobDoesNotExistException;
import com.spotify.helios.master.MasterModel;
import com.spotify.helios.servicescommon.statistics.MasterMetrics;
import com.yammer.metrics.annotation.ExceptionMetered;
import com.yammer.metrics.annotation.Timed;
import com.codahale.metrics.annotation.ExceptionMetered;
import com.codahale.metrics.annotation.Timed;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions helios-services/src/main/java/com/spotify/helios/master/resources/HostsResource.java
View file
Expand Up @@ -38,8 +38,8 @@
import com.spotify.helios.master.JobPortAllocationConflictException;
import com.spotify.helios.master.MasterModel;
import com.spotify.helios.master.http.PATCH;
import com.yammer.metrics.annotation.ExceptionMetered;
import com.yammer.metrics.annotation.Timed;
import com.codahale.metrics.annotation.ExceptionMetered;
import com.codahale.metrics.annotation.Timed;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
4 changes: 2 additions & 2 deletions helios-services/src/main/java/com/spotify/helios/master/resources/JobsResource.java
View file
Expand Up @@ -38,8 +38,8 @@
import com.spotify.helios.master.MasterModel;
import com.spotify.helios.servicescommon.statistics.MasterMetrics;
import com.sun.jersey.api.core.InjectParam;
import com.yammer.metrics.annotation.ExceptionMetered;
import com.yammer.metrics.annotation.Timed;
import com.codahale.metrics.annotation.ExceptionMetered;
import com.codahale.metrics.annotation.Timed;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
4 changes: 2 additions & 2 deletions helios-services/src/main/java/com/spotify/helios/master/resources/MastersResource.java
View file
Expand Up @@ -22,8 +22,8 @@
package com.spotify.helios.master.resources;

import com.spotify.helios.master.MasterModel;
import com.yammer.metrics.annotation.ExceptionMetered;
import com.yammer.metrics.annotation.Timed;
import com.codahale.metrics.annotation.ExceptionMetered;
import com.codahale.metrics.annotation.Timed;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions helios-services/src/main/java/com/spotify/helios/master/resources/VersionResource.java
View file
Expand Up @@ -25,8 +25,8 @@
import com.spotify.helios.common.Version;
import com.spotify.helios.common.VersionCheckResponse;
import com.spotify.helios.common.VersionCompatibility;
import com.yammer.metrics.annotation.ExceptionMetered;
import com.yammer.metrics.annotation.Timed;
import com.codahale.metrics.annotation.ExceptionMetered;
import com.codahale.metrics.annotation.Timed;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
Expand Down
2 changes: 1 addition & 1 deletion helios-services/src/main/java/com/spotify/helios/servicescommon/ManagedStatsdReporter.java
View file
Expand Up @@ -25,7 +25,7 @@
import com.google.common.base.Strings;

import com.readytalk.metrics.StatsDReporter;
import com.yammer.dropwizard.lifecycle.Managed;
import io.dropwizard.lifecycle.Managed;
import com.yammer.metrics.core.MetricsRegistry;

import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion helios-services/src/main/java/com/spotify/helios/servicescommon/RiemannHeartBeat.java
View file
Expand Up @@ -21,7 +21,7 @@

package com.spotify.helios.servicescommon;

import com.yammer.dropwizard.lifecycle.Managed;
import io.dropwizard.lifecycle.Managed;

import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
Expand Down
2 changes: 1 addition & 1 deletion helios-services/src/main/java/com/spotify/helios/servicescommon/RiemannSupport.java
View file
Expand Up @@ -26,7 +26,7 @@
import com.google.common.collect.Iterables;

import com.aphyr.riemann.client.RiemannClient;
import com.yammer.dropwizard.lifecycle.Managed;
import io.dropwizard.lifecycle.Managed;
import com.yammer.metrics.core.MetricsRegistry;
import com.yammer.metrics.reporting.RiemannReporter;
import com.yammer.metrics.reporting.RiemannReporter.Config;
Expand Down
6 changes: 3 additions & 3 deletions .../src/main/java/com/spotify/helios/servicescommon/coordination/ZooKeeperHealthChecker.java
View file
Expand Up @@ -22,8 +22,8 @@
package com.spotify.helios.servicescommon.coordination;

import com.spotify.helios.servicescommon.RiemannFacade;
import com.yammer.dropwizard.lifecycle.Managed;
import com.yammer.metrics.core.HealthCheck;
import io.dropwizard.lifecycle.Managed;
import com.codahale.metrics.health.HealthCheck;

import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.recipes.cache.PathChildrenCache;
Expand All @@ -50,7 +50,7 @@ public class ZooKeeperHealthChecker extends HealthCheck
public ZooKeeperHealthChecker(final ZooKeeperClient zooKeeperClient, final String path,
final RiemannFacade facade, final TimeUnit timeUnit,
final long interval) {
super("zookeeper");
super();
this.scheduler = Executors.newScheduledThreadPool(2);
this.cache = new PathChildrenCache(zooKeeperClient.getCuratorFramework(), path, true, false,
scheduler);
Expand Down
10 changes: 5 additions & 5 deletions helios-system-tests/pom.xml
View file
Expand Up @@ -24,9 +24,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.yammer.dropwizard</groupId>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<version>0.6.2</version>
<version>0.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
Expand Down Expand Up @@ -105,12 +105,12 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down Expand Up @@ -140,7 +140,7 @@
<dependency>
<groupId>net.sourceforge.argparse4j</groupId>
<artifactId>argparse4j</artifactId>
<version>0.4.1</version>
<version>0.4.3</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion helios-testing/pom.xml
View file
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>2.0.1</version>
<version>2.0.3</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions helios-tools/pom.xml
View file
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>com.yammer.metrics</groupId>
Expand All @@ -51,7 +51,7 @@
<dependency>
<groupId>net.sourceforge.argparse4j</groupId>
<artifactId>argparse4j</artifactId>
<version>0.4.1</version>
<version>0.4.3</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down

0 comments on commit 590780d

Please sign in to comment.