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

Upgrade dropwizard-core dep from 0.7.1 to 0.9.3 #1302

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Upgrade dropwizard-core dep from 0.7.1 to 0.9.3 #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
920199e
Upgrade dropwizard-core dep from 0.7.1 to 0.9.3
davidxia Sep 28, 2020
6a79269
Fix tests
davidxia Oct 6, 2020
6b6b8fe
Fix javax.ws.rs.core.Application.getProperties() error
davidxia Oct 6, 2020
38bcd7c
Fix another Jersey version incompatibility error
davidxia Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions helios-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@

<dependencies>
<!--compile deps-->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
Expand Down
13 changes: 5 additions & 8 deletions helios-services/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<masterImageName>helios-master:${project.version}</masterImageName>
<agentImageName>helios-agent:${project.version}</agentImageName>
<soloImageName>helios-solo:${project.version}</soloImageName>
<jersey.version>1.19.4</jersey.version>
</properties>

<profiles>
Expand Down Expand Up @@ -159,11 +160,7 @@
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<version>0.7.1</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>0.9.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
Expand Down Expand Up @@ -290,17 +287,17 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>1.18.1</version>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>1.18.1</version>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>1.18.1</version>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.spotify</groupId>
Expand Down
4 changes: 2 additions & 2 deletions helios-system-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<version>0.7.1</version>
<version>0.9.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
Expand Down Expand Up @@ -67,7 +67,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
<version>1.18.1</version>
<version>1.19.4</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
Expand Down
5 changes: 2 additions & 3 deletions helios-tools/src/main/java/com/spotify/helios/cli/command/DeploymentGroupStopCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.io.IOException;
import java.io.PrintStream;
import java.util.concurrent.ExecutionException;
import javax.ws.rs.core.Response;
import net.sourceforge.argparse4j.inf.Argument;
import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
Expand Down Expand Up @@ -56,10 +55,10 @@ int run(final Namespace options, final HeliosClient client, final PrintStream ou

// TODO(staffam): Support json output

if (status == Response.Status.NO_CONTENT.getStatusCode()) {
if (status == 204) {
out.println(format("Deployment-group %s stopped", name));
return 0;
} else if (status == Response.Status.NOT_FOUND.getStatusCode()) {
} else if (status == 404) {
out.println(format("Deployment-group %s not found", name));
return 1;
} else {
Expand Down
2 changes: 1 addition & 1 deletion ...-tools/src/test/java/com/spotify/helios/cli/command/DeploymentGroupRemoveCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public class DeploymentGroupRemoveCommandTest {
@Before
public void before() {
// Default CLI argument stubs
when(options.getString("deployment-group-name")).thenReturn(GROUP_NAME);
when(options.getString("deployment_group_name")).thenReturn(GROUP_NAME);
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion helios-tools/src/test/java/com/spotify/helios/cli/command/RollingUpdateCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public class RollingUpdateCommandTest {
@Before
public void before() {
// Default CLI argument stubs
when(options.getString("deployment-group-name")).thenReturn(GROUP_NAME);
when(options.getString("deployment_group_name")).thenReturn(GROUP_NAME);
when(options.getInt("parallelism")).thenReturn(PARALLELISM);
when(options.getLong("timeout")).thenReturn(TIMEOUT);
when(options.getLong("rollout_timeout")).thenReturn(10L);
Expand Down
7 changes: 1 addition & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,6 @@
<artifactId>joda-time</artifactId>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand All @@ -212,7 +207,7 @@
<dependency>
<groupId>net.sourceforge.argparse4j</groupId>
<artifactId>argparse4j</artifactId>
<version>0.4.3</version>
<version>0.6.0</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand Down