diff options
Diffstat (limited to 'mso-api-handlers')
4 files changed, 7 insertions, 15 deletions
diff --git a/mso-api-handlers/mso-api-handler-common/pom.xml b/mso-api-handlers/mso-api-handler-common/pom.xml index 156ce809c7..b20d64c5f1 100644 --- a/mso-api-handlers/mso-api-handler-common/pom.xml +++ b/mso-api-handlers/mso-api-handler-common/pom.xml @@ -18,8 +18,6 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <swagger-version>1.3.0</swagger-version> <jax-rs-version>1.1.1</jax-rs-version> - <json4s-jackson-version>3.2.4</json4s-jackson-version> - <json4s-core-version>3.0.0</json4s-core-version> <reflections-version>0.9.9-RC1</reflections-version> <paranamer-version>2.5.2</paranamer-version> <scannotation-version>1.0.3</scannotation-version> @@ -63,13 +61,11 @@ </dependency> <dependency> <groupId>org.json4s</groupId> - <artifactId>json4s-jackson_2.9.1-1</artifactId> - <version>${json4s-jackson-version}</version> + <artifactId>json4s-jackson_2.12</artifactId> </dependency> <dependency> <groupId>org.json4s</groupId> - <artifactId>json4s-core_2.9.2</artifactId> - <version>${json4s-core-version}</version> + <artifactId>json4s-core_2.12</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml index 9439dca1a1..aaa9b41448 100644 --- a/mso-api-handlers/mso-api-handler-infra/pom.xml +++ b/mso-api-handlers/mso-api-handler-infra/pom.xml @@ -18,8 +18,6 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <swagger-version>1.3.0</swagger-version> <jax-rs-version>1.1.1</jax-rs-version> - <json4s-jackson-version>3.2.4</json4s-jackson-version> - <json4s-core-version>3.0.0</json4s-core-version> <reflections-version>0.9.9-RC1</reflections-version> <paranamer-version>2.5.2</paranamer-version> <scannotation-version>1.0.3</scannotation-version> @@ -98,13 +96,11 @@ </dependency> <dependency> <groupId>org.json4s</groupId> - <artifactId>json4s-jackson_2.9.1-1</artifactId> - <version>${json4s-jackson-version}</version> + <artifactId>json4s-jackson_2.12</artifactId> </dependency> <dependency> <groupId>org.json4s</groupId> - <artifactId>json4s-core_2.9.2</artifactId> - <version>${json4s-core-version}</version> + <artifactId>json4s-core_2.12</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java index 1a95aa0e09..50ae29b8e4 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java @@ -80,8 +80,8 @@ import io.swagger.annotations.ApiOperation; @Component -@Path("/e2eServiceInstances") -@Api(value = "/e2eServiceInstances", description = "API Requests for E2E Service Instances") +@Path("/onap/so/infra/e2eServiceInstances") +@Api(value = "/onap/so/infra/e2eServiceInstances", description = "API Requests for E2E Service Instances") public class E2EServiceInstances { private HashMap<String, String> instanceIdMap = new HashMap<>(); diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/E2EServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/E2EServiceInstancesTest.java index 66e29a8117..a3d388a5c6 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/E2EServiceInstancesTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/E2EServiceInstancesTest.java @@ -59,7 +59,7 @@ import com.github.tomakehurst.wiremock.http.Fault; public class E2EServiceInstancesTest extends BaseTest { private final ObjectMapper mapper = new ObjectMapper(); - private final String e2eServInstancesUri = "/e2eServiceInstances/"; + private final String e2eServInstancesUri = "/onap/so/infra/e2eServiceInstances/"; @Before |