diff --git a/deploy-service/teletraanservice/pom.xml b/deploy-service/teletraanservice/pom.xml
index bd91ba8026..1ea7ee1f45 100644
--- a/deploy-service/teletraanservice/pom.xml
+++ b/deploy-service/teletraanservice/pom.xml
@@ -1,7 +1,7 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
teletraan-service
@@ -19,46 +19,34 @@
UTF-8
UTF-8
true
- 1.3.29
+ 2.1.11
1.7.3
+
+
+
+ io.dropwizard
+ dropwizard-dependencies
+ ${dropwizard.version}
+ pom
+ import
+
+
+
+
io.dropwizard
- dropwizard-auth
- ${dropwizard.version}
-
-
- io.dropwizard
- dropwizard-json-logging
- ${dropwizard.version}
+ dropwizard-core
io.dropwizard
- dropwizard-jackson
- ${dropwizard.version}
+ dropwizard-auth
io.dropwizard
- dropwizard-core
-
-
- org.hibernate.validator
- hibernate-validator
-
-
- ${dropwizard.version}
-
-
- io.dropwizard.modules
- dropwizard-health
- ${dropwizard.health.version}
-
-
- org.hibernate
- hibernate-validator
- 5.4.1.Final
+ dropwizard-json-logging
com.pinterest.teletraan
@@ -175,4 +163,4 @@
-
+
\ No newline at end of file
diff --git a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanAgentService.java b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanAgentService.java
index 23a90911dd..57e1c25a4e 100644
--- a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanAgentService.java
+++ b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanAgentService.java
@@ -4,9 +4,9 @@
* Licensed 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.
@@ -21,8 +21,6 @@
import io.dropwizard.setup.Environment;
import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
import io.dropwizard.configuration.SubstitutingSourceProvider;
-import io.dropwizard.health.conf.HealthConfiguration;
-import io.dropwizard.health.core.HealthCheckBundle;
import io.dropwizard.setup.Bootstrap;
public class TeletraanAgentService extends Application {
@@ -39,13 +37,7 @@ public void initialize(Bootstrap bootstrap) {
new EnvironmentVariableSubstitutor(false)
)
);
- bootstrap.addBundle(new HealthCheckBundle() {
- @Override
- protected HealthConfiguration getHealthConfiguration(final TeletraanServiceConfiguration configuration) {
- return configuration.getHealthConfiguration();
- }
- });
- }
+ }
@Override
public void run(TeletraanServiceConfiguration configuration, Environment environment) throws Exception {
diff --git a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanService.java b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanService.java
index 0fda13f885..7262a6931d 100644
--- a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanService.java
+++ b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanService.java
@@ -22,8 +22,6 @@
import io.dropwizard.Application;
import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
import io.dropwizard.configuration.SubstitutingSourceProvider;
-import io.dropwizard.health.conf.HealthConfiguration;
-import io.dropwizard.health.core.HealthCheckBundle;
import io.dropwizard.setup.Bootstrap;
import io.dropwizard.setup.Environment;
import io.swagger.jaxrs.config.BeanConfig;
@@ -53,12 +51,6 @@ public void initialize(Bootstrap bootstrap) {
new EnvironmentVariableSubstitutor(false)
)
);
- bootstrap.addBundle(new HealthCheckBundle() {
- @Override
- protected HealthConfiguration getHealthConfiguration(final TeletraanServiceConfiguration configuration) {
- return configuration.getHealthConfiguration();
- }
- });
}
@Override
diff --git a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanServiceConfiguration.java b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanServiceConfiguration.java
index 44999d831f..8343b085d2 100644
--- a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanServiceConfiguration.java
+++ b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanServiceConfiguration.java
@@ -45,7 +45,6 @@
import com.pinterest.teletraan.config.WorkerConfig;
import io.dropwizard.Configuration;
-import io.dropwizard.health.conf.HealthConfiguration;
public class TeletraanServiceConfiguration extends Configuration {
@Valid
@@ -117,9 +116,6 @@ public class TeletraanServiceConfiguration extends Configuration {
@JsonProperty("pingrequestvalidators")
private List pingRequestValidators;
- @JsonProperty("health")
- private HealthConfiguration healthConfiguration = new HealthConfiguration();
-
@Valid
private MicrometerMetricsFactory metricsFactory = new MicrometerMetricsFactory();
@@ -290,14 +286,6 @@ public void setDefaultScmTypeName(String defaultScmTypeName) {
this.defaultScmTypeName = defaultScmTypeName;
}
- public HealthConfiguration getHealthConfiguration() {
- return healthConfiguration;
- }
-
- public void setHealthConfiguration(final HealthConfiguration healthConfiguration) {
- this.healthConfiguration = healthConfiguration;
- }
-
public AwsFactory getAwsFactory() {
return awsFactory;
}
diff --git a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanWorker.java b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanWorker.java
index ab3c5ab16b..10bc8dbccb 100644
--- a/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanWorker.java
+++ b/deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/TeletraanWorker.java
@@ -4,9 +4,9 @@
* Licensed 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.
@@ -20,8 +20,6 @@
import io.dropwizard.setup.Environment;
import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
import io.dropwizard.configuration.SubstitutingSourceProvider;
-import io.dropwizard.health.conf.HealthConfiguration;
-import io.dropwizard.health.core.HealthCheckBundle;
import io.dropwizard.setup.Bootstrap;
public class TeletraanWorker extends Application {
@@ -38,12 +36,6 @@ public void initialize(Bootstrap bootstrap) {
new EnvironmentVariableSubstitutor(false)
)
);
- bootstrap.addBundle(new HealthCheckBundle() {
- @Override
- protected HealthConfiguration getHealthConfiguration(final TeletraanServiceConfiguration configuration) {
- return configuration.getHealthConfiguration();
- }
- });
}
@Override