Merge 'origin/casablanca' into master

[so.git] / mso-api-handlers / mso-api-handler-infra / pom.xml

diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index e193fad..dd77c24 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.so</groupId>
                <artifactId>mso-api-handlers</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
+               <version>1.4.0-SNAPSHOT</version>
        </parent>
 
 
@@ -14,10 +14,14 @@
        <name>mso-api-handler-infra</name>
        <description>ONAP SO API Handler Infra</description>
        <properties>
+               <camunda.version>7.9.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>
                <swagger-version>1.3.0</swagger-version>
                <jax-rs-version>1.1.1</jax-rs-version>
+               <json4s-jackson-version>3.6.0</json4s-jackson-version>
+               <json4s-core-version>3.6.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>
@@ -33,9 +37,21 @@
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
+                       <dependency>
+                               <!-- Import dependency management from camunda -->
+                               <groupId>org.camunda.bpm</groupId>
+                               <artifactId>camunda-bom</artifactId>
+                               <version>${camunda.version}</version>
+                               <scope>import</scope>
+                               <type>pom</type>
+                       </dependency>
                </dependencies>
        </dependencyManagement>
        <dependencies>
+               <dependency>
+             <groupId>org.camunda.bpm</groupId>
+             <artifactId>camunda-engine</artifactId>
+           </dependency>       
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-web</artifactId>
@@ -64,26 +80,12 @@
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-data-jpa</artifactId>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.apache.tomcat</groupId>
-                                       <artifactId>tomcat-jdbc</artifactId>
-                               </exclusion>
-                       </exclusions>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-dbcp2</artifactId>
                </dependency>
                <dependency>
                        <groupId>commons-lang</groupId>
                        <artifactId>commons-lang</artifactId>
                        <version>2.6</version>
                </dependency>
-               <dependency>
-                       <groupId>antlr</groupId>
-                       <artifactId>antlr</artifactId>
-               </dependency>
                <dependency>
                        <groupId>javax.activation</groupId>
                        <artifactId>activation</artifactId>
@@ -97,22 +99,20 @@
                <dependency>
                        <groupId>org.json4s</groupId>
                        <artifactId>json4s-jackson_2.12</artifactId>
+                       <version>${json4s-jackson-version}</version>
                </dependency>
                <dependency>
                        <groupId>org.json4s</groupId>
                        <artifactId>json4s-core_2.12</artifactId>
+                       <version>${json4s-core-version}</version>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>javax.servlet-api</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.javassist</groupId>
-                       <artifactId>javassist</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.json</groupId>
-                       <artifactId>json</artifactId>
+                       <groupId>javax.interceptor</groupId>
+                       <artifactId>javax.interceptor-api</artifactId>
                </dependency>
 
                <!-- Dependencies on other MSO Projects -->
@@ -131,11 +131,6 @@
                        <artifactId>mso-catalog-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.onap.so</groupId>
-                       <artifactId>MSORESTClient</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
 
                <!-- Test Dependencies -->
                <dependency>
@@ -160,11 +155,6 @@
                                </exclusion>
                        </exclusions>
                </dependency>
-               <dependency>
-                       <groupId>org.onap.so</groupId>
-                       <artifactId>MSORESTClient</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
                <dependency>
                        <groupId>com.github.java-json-tools</groupId>
                        <artifactId>json-schema-core</artifactId>
@@ -175,11 +165,6 @@
                        <artifactId>json-schema-validator</artifactId>
                        <version>2.2.8</version>
                </dependency>
-               <dependency>
-                       <groupId>janino</groupId>
-                       <artifactId>janino</artifactId>
-                       <version>2.5.15</version>
-               </dependency>
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-test</artifactId>
@@ -218,13 +203,11 @@
                </dependency>
                <dependency>
                        <groupId>io.micrometer</groupId>
-                       <artifactId>micrometer-spring-legacy</artifactId>
-                       <version>1.0.5</version>
+                       <artifactId>micrometer-core</artifactId>
                </dependency>
                <dependency>
                        <groupId>io.micrometer</groupId>
                        <artifactId>micrometer-registry-prometheus</artifactId>
-                       <version>1.0.5</version>
                </dependency>
        </dependencies>
 
@@ -233,7 +216,7 @@
                <plugins>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>                          
+                               <artifactId>maven-surefire-plugin</artifactId>
                                <executions>
                                        <execution>
                                                <id>default-test</id>
@@ -261,7 +244,7 @@
                                                </goals>
                                        </execution>
                                </executions>
-                       </plugin>                       
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-dependency-plugin</artifactId>