Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 2 additions & 27 deletions ambari-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<guice.version>5.1.0</guice.version>
<spring.version>5.3.22</spring.version>
<spring.security.version>5.7.8</spring.security.version>
<fasterxml.jackson.version>2.13.5</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.13.5</fasterxml.jackson.databind.version>
<fasterxml.jackson.version>2.18.2</fasterxml.jackson.version>
<fasterxml.jackson.databind.version>2.18.2</fasterxml.jackson.databind.version>
<postgres.version>42.3.8</postgres.version>
<testContainers.version>1.17.6</testContainers.version>
<forkCount>4</forkCount>
Expand Down Expand Up @@ -450,31 +450,6 @@
<artifactId>jersey-grizzly</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.9</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<version>1.9.9</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
<version>1.9.9</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mappper</artifactId>
<version>1.9.9</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions ambari-server-spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,9 @@

<!-- provides consumers of the SPI the ability to use Jackson annotations for object serialization -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>

<dependency>
Expand Down
22 changes: 13 additions & 9 deletions ambari-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1442,16 +1442,19 @@
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
Expand Down Expand Up @@ -1490,10 +1493,10 @@
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</dependency>
<dependency>
<!--<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</dependency>
</dependency>-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
Expand Down Expand Up @@ -1697,7 +1700,8 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.apache.ambari.server.agent;

import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;

public class CommandReport {

Expand All @@ -35,144 +35,122 @@ public class CommandReport {
private String customCommand;

@JsonProperty("customCommand")
@com.fasterxml.jackson.annotation.JsonProperty("customCommand")
public String getCustomCommand() {
return customCommand;
}

@JsonProperty("customCommand")
@com.fasterxml.jackson.annotation.JsonProperty("customCommand")
public void setCustomCommand(String customCommand) {
this.customCommand = customCommand;
}

@JsonProperty("taskId")
@com.fasterxml.jackson.annotation.JsonProperty("taskId")
public long getTaskId() {
return taskId;
}

@JsonProperty("taskId")
@com.fasterxml.jackson.annotation.JsonProperty("taskId")
public void setTaskId(long taskId) {
this.taskId = taskId;
}

@JsonProperty("actionId")
@com.fasterxml.jackson.annotation.JsonProperty("actionId")
public String getActionId() {
return this.actionId;
}

@JsonProperty("actionId")
@com.fasterxml.jackson.annotation.JsonProperty("actionId")
public void setActionId(String actionId) {
this.actionId = actionId;
}

@JsonProperty("stderr")
@com.fasterxml.jackson.annotation.JsonProperty("stderr")
public String getStdErr() {
return this.stderr;
}

@JsonProperty("stderr")
@com.fasterxml.jackson.annotation.JsonProperty("stderr")
public void setStdErr(String stderr) {
this.stderr = stderr;
}

@JsonProperty("exitcode")
@com.fasterxml.jackson.annotation.JsonProperty("exitcode")
public int getExitCode() {
return this.exitCode;
}

@JsonProperty("exitcode")
@com.fasterxml.jackson.annotation.JsonProperty("exitcode")
public void setExitCode(int exitCode) {
this.exitCode = exitCode;
}

@JsonProperty("stdout")
@com.fasterxml.jackson.annotation.JsonProperty("stdout")
public String getStdOut() {
return this.stdout;
}

@JsonProperty("stdout")
@com.fasterxml.jackson.annotation.JsonProperty("stdout")
public void setStdOut(String stdout) {
this.stdout = stdout;
}

@JsonProperty("structuredOut")
@com.fasterxml.jackson.annotation.JsonProperty("structuredOut")
public String getStructuredOut() {
return this.structuredOut;
}


@JsonProperty("structuredOut")
@com.fasterxml.jackson.annotation.JsonProperty("structuredOut")
public void setStructuredOut(String structuredOut) {
this.structuredOut = structuredOut;
}

@JsonProperty("roleCommand")
@com.fasterxml.jackson.annotation.JsonProperty("roleCommand")
public String getRoleCommand() {
return this.roleCommand;
}

@JsonProperty("roleCommand")
@com.fasterxml.jackson.annotation.JsonProperty("roleCommand")
public void setRoleCommand(String roleCommand) {
this.roleCommand = roleCommand;
}

@JsonProperty("role")
@com.fasterxml.jackson.annotation.JsonProperty("role")
public String getRole() {
return role;
}

@JsonProperty("role")
@com.fasterxml.jackson.annotation.JsonProperty("role")
public void setRole(String role) {
this.role = role;
}

@JsonProperty("status")
@com.fasterxml.jackson.annotation.JsonProperty("status")
public String getStatus() {
return status;
}

@JsonProperty("status")
@com.fasterxml.jackson.annotation.JsonProperty("status")
public void setStatus(String status) {
this.status = status;
}

@JsonProperty("serviceName")
@com.fasterxml.jackson.annotation.JsonProperty("serviceName")
public String getServiceName() {
return serviceName;
}

@JsonProperty("serviceName")
@com.fasterxml.jackson.annotation.JsonProperty("serviceName")
public void setServiceName(String serviceName) {
this.serviceName = serviceName;
}

@com.fasterxml.jackson.annotation.JsonProperty("clusterId")
@JsonProperty("clusterId")
public String getClusterId() {
return clusterId;
}

@com.fasterxml.jackson.annotation.JsonProperty("clusterId")
@JsonProperty("clusterId")
public void setClusterId(String clusterId) {
this.clusterId = clusterId;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.apache.ambari.server.agent;

import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;


public class ComponentRecoveryReport {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import java.util.Map;

import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;

public class ComponentsResponse {
@JsonProperty("clusterName")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

package org.apache.ambari.server.agent;

import org.codehaus.jackson.annotate.JsonProperty;
import com.fasterxml.jackson.annotation.JsonProperty;


/**
Expand Down Expand Up @@ -59,85 +59,71 @@ public DiskInfo(String device, String mountpoint, String available,
public DiskInfo() {}

@JsonProperty("available")
@com.fasterxml.jackson.annotation.JsonProperty("available")
public void setAvailable(String available) {
this.available = available;
}

@JsonProperty("available")
@com.fasterxml.jackson.annotation.JsonProperty("available")
public String getAvailable() {
return this.available;
}

@JsonProperty("mountpoint")
@com.fasterxml.jackson.annotation.JsonProperty("mountpoint")
public String getMountPoint() {
return this.mountpoint;
}

@JsonProperty("mountpoint")
@com.fasterxml.jackson.annotation.JsonProperty("mountpoint")
public void setMountPoint(String mountpoint) {
this.mountpoint = mountpoint;
}

@JsonProperty("type")
@com.fasterxml.jackson.annotation.JsonProperty("type")
public String getType() {
return this.type;
}

@JsonProperty("type")
@com.fasterxml.jackson.annotation.JsonProperty("type")
public void setType(String type) {
this.type = type;
}

@JsonProperty("used")
@com.fasterxml.jackson.annotation.JsonProperty("used")
public String getUsed() {
return this.used;
}

@JsonProperty("used")
@com.fasterxml.jackson.annotation.JsonProperty("used")
public void setUsed(String used) {
this.used = used;
}

@JsonProperty("percent")
@com.fasterxml.jackson.annotation.JsonProperty("percent")
public String getPercent() {
return this.percent;
}

@JsonProperty("percent")
@com.fasterxml.jackson.annotation.JsonProperty("percent")
public void setPercent(String percent) {
this.percent = percent;
}

@JsonProperty("size")
@com.fasterxml.jackson.annotation.JsonProperty("size")
public String getSize() {
return this.size;
}

@JsonProperty("size")
@com.fasterxml.jackson.annotation.JsonProperty("size")
public void setSize(String size) {
this.size = size;
}

@JsonProperty("device")
@com.fasterxml.jackson.annotation.JsonProperty("device")
public String getDevice() {
return device;
}

@JsonProperty("device")
@com.fasterxml.jackson.annotation.JsonProperty("device")
public void setDevice(String device) {
this.device = device;
}
Expand Down
Loading