Update web.xml file to enable properties

[so.git] / bpmn / MSOCommonBPMN / pom.xml

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index a0a5a24..32e7d4a 100644 (file)
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -15,7 +15,7 @@
        <properties>
                <camunda.version>7.8.0</camunda.version>
                <spring.version>4.3.2.RELEASE</spring.version>
-               <httpclient.version>3.1</httpclient.version>
+               <httpclient.version>4.5.5</httpclient.version>
                <jax.ws.rs>2.0.1</jax.ws.rs>
                <jackson.version>1.1.1</jackson.version>
                <maven.compiler.target>1.8</maven.compiler.target>
@@ -351,9 +351,24 @@
                        <version>4.3.14.RELEASE</version>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.sdc.sdc-tosca</groupId>
+                       <groupId>org.onap.sdc.sdc-tosca</groupId>
                        <artifactId>sdc-tosca</artifactId>
-                       <version>1.2.3</version>
+                       <version>1.3.3</version>
+                       <!-- sdc-tosca:1.3.3 depends on jtosca:1.3.4-SNAPSHOT,
+                            which must be excluded, and the release version
+                            of jtosca must be pulled in using an additional
+                            dependency, below -->
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.onap.sdc.jtosca</groupId>
+                                       <artifactId>jtosca</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.sdc.jtosca</groupId>
+                       <artifactId>jtosca</artifactId>
+                       <version>1.3.4</version>
                </dependency>
                <dependency>
                        <groupId>org.camunda.bpm</groupId>
@@ -371,8 +386,8 @@
                        <version>1.6.12</version>
                </dependency>
                <dependency>
-                       <groupId>commons-httpclient</groupId>
-                       <artifactId>commons-httpclient</artifactId>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpclient</artifactId>
                        <version>${httpclient.version}</version>
                </dependency>
                <dependency>
@@ -395,15 +410,18 @@
                        <artifactId>spring-web</artifactId>
                        <version>${spring.version}</version>
                </dependency>
+               <!-- bwj: duplicated one
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-test</artifactId>
                        <version>${spring.version}</version>
                </dependency>
+               -->
+               <!-- bwj: added -->
                <dependency>
-                       <groupId>commons-httpclient</groupId>
-                       <artifactId>commons-httpclient</artifactId>
-                       <version>${httpclient.version}</version>
+                       <groupId>com.googlecode.libphonenumber</groupId>
+                       <artifactId>libphonenumber</artifactId>
+                       <version>8.9.1</version>
                </dependency>
                <dependency>
                        <groupId>javax.ws.rs</groupId>
@@ -413,7 +431,7 @@
                <dependency>
                        <groupId>org.onap.appc.client</groupId>
                        <artifactId>client-lib</artifactId>
-                       <version>1.3.0-SNAPSHOT</version>
+                       <version>1.3.0</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.appc.client</groupId>