aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2019-02-15 12:40:15 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-15 12:40:15 +0000
commit7b4a8742c8ed874b436025d4f7bea43ffbf03805 (patch)
treea8ea2a819ec849261e2e0985760a7c40927789a1
parent466bc45cde6b405dbd9ab71b6ca8059a98ba9fa6 (diff)
parent5442c270ad879e4db33b2759b15bf46111af2fa7 (diff)
Merge "updated camunda springboot version"
-rw-r--r--bpmn/pom.xml4
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilderTest.java71
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilderTest.java21
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/ServiceRpcInputEntityBuilderTest.java21
-rw-r--r--bpmn/so-bpmn-tasks/src/test/resources/schema.sql11
-rw-r--r--mso-api-handlers/mso-api-handler-infra/pom.xml4
-rw-r--r--pom.xml30
7 files changed, 104 insertions, 58 deletions
diff --git a/bpmn/pom.xml b/bpmn/pom.xml
index e28bedda99..df68017f5c 100644
--- a/bpmn/pom.xml
+++ b/bpmn/pom.xml
@@ -15,7 +15,7 @@
<packaging>pom</packaging>
<properties>
- <camunda.version>7.9.0</camunda.version>
+ <camunda.version>7.10.0</camunda.version>
<camunda.bpm.assert.version>1.2</camunda.bpm.assert.version>
<camunda.bpm.webapp.artifact>camunda-webapp-jboss-standalone</camunda.bpm.webapp.artifact>
<h2.version>1.4.196</h2.version>
@@ -28,7 +28,7 @@
<modules>
<module>MSOCoreBPMN</module>
-
+
<module>MSOCommonBPMN</module>
<module>so-bpmn-infrastructure-common</module>
<module>so-bpmn-tasks</module>
diff --git a/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilderTest.java b/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilderTest.java
index 828e3fca47..4ac131f873 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilderTest.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilderTest.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.camunda.bpm.engine.ProcessEngine;
import org.camunda.bpm.engine.ProcessEngineServices;
import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.camunda.bpm.engine.runtime.Incident;
@@ -53,7 +54,7 @@ public class AbstractBuilderTest {
private String operType;
private String resourceType;
private String requestId;
-
+
@Override
public String getProcessInstanceId() {
return null;
@@ -326,18 +327,30 @@ public class AbstractBuilderTest {
public void removeVariablesLocal() {
}
+
+ @Override
+ public ProcessEngine getProcessEngine(){
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void setProcessBusinessKey(String arg0){
+ // TODO Auto-generated method stub
+
+ }
};
@Test
public void requestActionGetIntValueTest() {
assertEquals(0, RequestAction.CREATE_NETWORK_INSTANCE.getIntValue());
}
-
+
@Test
public void svcActionGetIntValueTest() {
assertEquals(0, SvcAction.RESERVE.getIntValue());
}
-
+
@Test
public void buildTest() throws Exception {
abstractBuilder.build(null, null);
@@ -347,75 +360,75 @@ public class AbstractBuilderTest {
public void getRequestActionBlankOperationTypeTest() throws Exception {
assertEquals(AbstractBuilder.RequestAction.CREATE_NETWORK_INSTANCE.getName(), abstractBuilder.getRequestAction(delegateExecution));
}
-
+
@Test
public void getRequestActionDeleteOperationTypeBlankResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.DELETE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "");
assertEquals(AbstractBuilder.RequestAction.DELETE_SERVICE_INSTANCE.getName(), abstractBuilder.getRequestAction(delegateExecution));
}
-
+
@Test
public void getRequestActionDeleteOperationTypeBadResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.DELETE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "bad");
assertEquals(AbstractBuilder.RequestAction.DELETE_SERVICE_INSTANCE.getName(), abstractBuilder.getRequestAction(delegateExecution));
}
-
+
@Test
public void getRequestActionDeleteOperationTypeOverlayResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.DELETE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "overlay");
assertEquals(AbstractBuilder.RequestAction.DEACTIVATE_DCI_NETWORK_INSTANCE.getName(), abstractBuilder.getRequestAction(delegateExecution));
}
-
+
@Test
public void getRequestActionDeleteOperationTypeUnderlayResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.DELETE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "underlay");
assertEquals(AbstractBuilder.RequestAction.DELETE_NETWORK_INSTANCE.getName(), abstractBuilder.getRequestAction(delegateExecution));
}
-
+
@Test
public void getRequestActionDeleteOperationTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.DELETE);
assertEquals(AbstractBuilder.RequestAction.DELETE_SERVICE_INSTANCE.getName(), abstractBuilder.getRequestAction(delegateExecution));
}
-
+
@Test
public void getRequestActionCreateOperationTypeBlankResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.CREATE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "");
assertEquals(AbstractBuilder.RequestAction.CREATE_SERVICE_INSTANCE.getName(), abstractBuilder.getRequestAction(delegateExecution));
}
-
+
@Test
public void getRequestActionCreateOperationTypeBadResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.CREATE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "bad");
assertEquals(AbstractBuilder.RequestAction.CREATE_SERVICE_INSTANCE.getName(), abstractBuilder.getRequestAction(delegateExecution));
}
-
+
@Test
public void getRequestActionCreateOperationTypeOverlayResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.CREATE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "overlay");
assertEquals(AbstractBuilder.RequestAction.ACTIVATE_DCI_NETWORK_INSTANCE.getName(), abstractBuilder.getRequestAction(delegateExecution));
}
-
+
@Test
public void getRequestActionCreateOperationTypeUnderlayResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.CREATE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "underlay");
assertEquals(AbstractBuilder.RequestAction.CREATE_NETWORK_INSTANCE.getName(), abstractBuilder.getRequestAction(delegateExecution));
}
-
+
@Test
public void getRequestActionCreateOperationTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.CREATE);
assertEquals(AbstractBuilder.RequestAction.CREATE_SERVICE_INSTANCE.getName(), abstractBuilder.getRequestAction(delegateExecution));
}
-
+
@Test
public void getRequestActionBadOperationType() {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, "bad");
@@ -426,75 +439,75 @@ public class AbstractBuilderTest {
public void getSvcActionBlankOperationTypeTest() throws Exception {
assertEquals(AbstractBuilder.SvcAction.CREATE.getName(), abstractBuilder.getSvcAction(delegateExecution));
}
-
+
@Test
public void getSvcActionDeleteOperationTypeBlankResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.DELETE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "");
assertEquals(AbstractBuilder.SvcAction.UNASSIGN.getName(), abstractBuilder.getSvcAction(delegateExecution));
}
-
+
@Test
public void getSvcActionDeleteOperationTypeBadResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.DELETE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "bad");
assertEquals(AbstractBuilder.SvcAction.UNASSIGN.getName(), abstractBuilder.getSvcAction(delegateExecution));
}
-
+
@Test
public void getSvcActionDeleteOperationTypeOverlayResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.DELETE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "overlay");
assertEquals(AbstractBuilder.SvcAction.DEACTIVATE.getName(), abstractBuilder.getSvcAction(delegateExecution));
}
-
+
@Test
public void getSvcActionDeleteOperationTypeUnderlayResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.DELETE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "underlay");
assertEquals(AbstractBuilder.SvcAction.DELETE.getName(), abstractBuilder.getSvcAction(delegateExecution));
}
-
+
@Test
public void getSvcActionDeleteOperationTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.DELETE);
assertEquals(AbstractBuilder.SvcAction.UNASSIGN.getName(), abstractBuilder.getSvcAction(delegateExecution));
}
-
+
@Test
public void getSvcActionCreateOperationTypeBlankResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.CREATE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "");
assertEquals(AbstractBuilder.SvcAction.ASSIGN.getName(), abstractBuilder.getSvcAction(delegateExecution));
}
-
+
@Test
public void getSvcActionCreateOperationTypeBadResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.CREATE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "bad");
assertEquals(AbstractBuilder.SvcAction.ASSIGN.getName(), abstractBuilder.getSvcAction(delegateExecution));
}
-
+
@Test
public void getSvcActionCreateOperationTypeOverlayResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.CREATE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "overlay");
assertEquals(AbstractBuilder.SvcAction.ACTIVATE.getName(), abstractBuilder.getSvcAction(delegateExecution));
}
-
+
@Test
public void getSvcActionCreateOperationTypeUnderlayResourceTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.CREATE);
delegateExecution.setVariable(AbstractBuilder.RESOURCE_TYPE, "underlay");
assertEquals(AbstractBuilder.SvcAction.CREATE.getName(), abstractBuilder.getSvcAction(delegateExecution));
}
-
+
@Test
public void getSvcActionCreateOperationTypeTest() throws Exception {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, RequestsDbConstant.OperationType.CREATE);
assertEquals(AbstractBuilder.SvcAction.ASSIGN.getName(), abstractBuilder.getSvcAction(delegateExecution));
}
-
+
@Test
public void getSvcActionBadOperationType() {
delegateExecution.setVariable(AbstractBuilder.OPERATION_TYPE, "bad");
@@ -505,14 +518,14 @@ public class AbstractBuilderTest {
public void getRequestIdBlankNotOnExecutionTest() {
abstractBuilder.getRequestId(delegateExecution);
}
-
+
@Test
public void getRequestIdBlankOnExecutionTest() {
String expected = "requestId";
delegateExecution.setVariable("msoRequestId", expected);
assertEquals(expected, abstractBuilder.getRequestId(delegateExecution));
}
-
+
@Test
public void getRequestIdTest() {
String expected = "requestId";
@@ -539,13 +552,13 @@ public class AbstractBuilderTest {
assertEquals("foo", list.get(0).getName());
assertEquals("bar", list.get(0).getValue());
}
-
+
@Test
public void getParamEntitiesNullInputsTest() {
List<ParamEntity> list = abstractBuilder.getParamEntities(null);
assertEquals(0, list.size());
}
-
+
@Test
public void getParamEntitiesEmptyInputsTest() {
List<ParamEntity> list = abstractBuilder.getParamEntities(new HashMap<>());
diff --git a/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilderTest.java b/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilderTest.java
index f7d73a33e1..4e39c7b4e3 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilderTest.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/NetworkRpcInputEntityBuilderTest.java
@@ -7,9 +7,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.
@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.Set;
+import org.camunda.bpm.engine.ProcessEngine;
import org.camunda.bpm.engine.ProcessEngineServices;
import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.camunda.bpm.engine.runtime.Incident;
@@ -35,12 +36,12 @@ import org.junit.Test;
public class NetworkRpcInputEntityBuilderTest {
NetworkRpcInputEntityBuilder networRpcInputEntityBuilder = new NetworkRpcInputEntityBuilder();
-
+
DelegateExecution delegateExecution = new DelegateExecution() {
private String operType;
private String resourceType;
private String requestId;
-
+
@Override
public String getProcessInstanceId() {
return null;
@@ -313,6 +314,18 @@ public class NetworkRpcInputEntityBuilderTest {
public void removeVariablesLocal() {
}
+
+ @Override
+ public ProcessEngine getProcessEngine(){
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void setProcessBusinessKey(String arg0){
+ // TODO Auto-generated method stub
+
+ }
};
@Test
diff --git a/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/ServiceRpcInputEntityBuilderTest.java b/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/ServiceRpcInputEntityBuilderTest.java
index 4db0421936..556ff67fad 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/ServiceRpcInputEntityBuilderTest.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/test/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/ServiceRpcInputEntityBuilderTest.java
@@ -7,9 +7,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.
@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.Set;
+import org.camunda.bpm.engine.ProcessEngine;
import org.camunda.bpm.engine.ProcessEngineServices;
import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.camunda.bpm.engine.runtime.Incident;
@@ -35,12 +36,12 @@ import org.junit.Test;
public class ServiceRpcInputEntityBuilderTest {
ServiceRpcInputEntityBuilder serviceRpcInputEntityBuilder = new ServiceRpcInputEntityBuilder();
-
+
DelegateExecution delegateExecution = new DelegateExecution() {
private String operType;
private String resourceType;
private String requestId;
-
+
@Override
public String getProcessInstanceId() {
return null;
@@ -313,6 +314,18 @@ public class ServiceRpcInputEntityBuilderTest {
public void removeVariablesLocal() {
}
+
+ @Override
+ public ProcessEngine getProcessEngine(){
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void setProcessBusinessKey(String arg0){
+ // TODO Auto-generated method stub
+
+ }
};
@Test
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/schema.sql b/bpmn/so-bpmn-tasks/src/test/resources/schema.sql
index 7a15e84662..5ae6a2d972 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/schema.sql
+++ b/bpmn/so-bpmn-tasks/src/test/resources/schema.sql
@@ -1184,5 +1184,12 @@ alter table ACT_ID_TENANT_MEMBER
add constraint ACT_FK_TENANT_MEMB_GROUP
foreign key (GROUP_ID_)
references ACT_ID_GROUP (ID_);
-
-
+
+ALTER TABLE ACT_GE_BYTEARRAY
+ ADD TYPE_ integer;
+
+ALTER TABLE ACT_GE_BYTEARRAY
+ ADD CREATE_TIME_ datetime(3);
+
+ALTER TABLE ACT_RE_PROCDEF
+ ADD STARTABLE_ BOOLEAN NOT NULL DEFAULT TRUE; \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index dd77c242d4..f3163840ec 100644
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -14,7 +14,7 @@
<name>mso-api-handler-infra</name>
<description>ONAP SO API Handler Infra</description>
<properties>
- <camunda.version>7.9.0</camunda.version>
+ <camunda.version>7.10.0</camunda.version>
<camunda.bpm.assert.version>1.2</camunda.bpm.assert.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.camunda.bpm</groupId>
<artifactId>camunda-engine</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
diff --git a/pom.xml b/pom.xml
index d7664ef342..1d5d53d9a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,8 +65,8 @@
<siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
<cxf.version>3.2.6</cxf.version>
<jax.ws.rs>2.1</jax.ws.rs>
- <springboot.version>2.0.5.RELEASE</springboot.version>
- <camunda.springboot.version>3.0.0</camunda.springboot.version>
+ <springboot.version>2.0.5.RELEASE</springboot.version>
+ <camunda.springboot.version>3.2.0</camunda.springboot.version>
</properties>
<distributionManagement>
<repository>
@@ -397,13 +397,13 @@
<skip>${docker.skip}</skip>
<skipBuild>${docker.skip.build}</skipBuild>
<skipPush>${docker.skip.push}</skipPush>
- <dockerHost>${docker.newHost}</dockerHost> <!-- 1. Update address to your local docker VM. 2. Add IP to your NO_PROXY
+ <dockerHost>${docker.newHost}</dockerHost> <!-- 1. Update address to your local docker VM. 2. Add IP to your NO_PROXY
environment variable -->
- <certPath>${docker.host.cert.path}</certPath><!-- Add -Ddocker.host.cert.pat="path
+ <certPath>${docker.host.cert.path}</certPath><!-- Add -Ddocker.host.cert.pat="path
to your local certs directory" to maven build command -->
- <pushRegistry>${dockerPushRepo}</pushRegistry> <!-- Update .m2/settings.xml Add server id settings.dockerRepository, username,
+ <pushRegistry>${dockerPushRepo}</pushRegistry> <!-- Update .m2/settings.xml Add server id settings.dockerRepository, username,
and password -->
- <pullRegistry>${dockerPullRepo}</pullRegistry> <!-- If docker repo is not public. Update .m2/settings.xml Add server id
+ <pullRegistry>${dockerPullRepo}</pullRegistry> <!-- If docker repo is not public. Update .m2/settings.xml Add server id
settings.dockerRepository, username, and password -->
<images>
<image>
@@ -522,27 +522,27 @@
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-base</artifactId>
+ <artifactId>jackson-jaxrs-base</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@@ -573,7 +573,7 @@
</dependency>
<dependency>
<groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -666,7 +666,7 @@
<dependencyManagement>
<dependencies>
<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
- <!-- force use of version 4.5 everywhere in transient deps, aligned on
+ <!-- force use of version 4.5 everywhere in transient deps, aligned on
WildFly 10 version -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -685,7 +685,7 @@
<artifactId>commons-io</artifactId>
<version>2.5</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>