From 7e44fa716640f855fa066c7b0d8f7dca767837b0 Mon Sep 17 00:00:00 2001
From: "Determe, Sebastien (sd378r)" <sd378r@intl.att.com>
Date: Wed, 7 Feb 2018 10:11:30 +0100
Subject: Remove AJSC container.

Remove AJSC container and adapt the dependencies & unit tests

Issue-ID: CLAMP-85
Change-Id: I4289dd8a13645df238f35d2791718639b04a509f
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---
 pom.xml | 217 ++++++++++++++++++++++++++++------------------------------------
 1 file changed, 93 insertions(+), 124 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 433aef12..e11e44e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP CLAMP
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,11 +33,11 @@
 		<parent>
 				<groupId>org.onap.oparent</groupId>
 				<artifactId>oparent</artifactId>
-				<version>1.0.0-SNAPSHOT</version>
+				<version>1.1.0-SNAPSHOT</version>
 		</parent>
 
 		<description>
-           This project build the ONAP CLAMP JAR that contains AJSC + CLAMP code.
+           This project build the ONAP CLAMP JAR that contains CLAMP back-end code and its UI part.
 
            By Default "mvn clean install" command will execute also the unit tests
            and the integration tests. The integration tests require a docker engine running.
@@ -54,7 +54,7 @@
 				- org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
 				- org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties
 
-    </description>
+		</description>
 
 		<properties>
 				<maven.build.timestamp.format>yyyy.MM.dd'T'hh.mm.ss'Z'</maven.build.timestamp.format>
@@ -66,12 +66,12 @@
 				<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 				<docker.mariadb.port.host>3306</docker.mariadb.port.host>
-				<sdk.java.common.logging>0.0.3-oss</sdk.java.common.logging>
 				<project.scm.id>git-server</project.scm.id>
 				<java.version>1.8</java.version>
-				<csi.logging>6.1.0.6-oss</csi.logging>
-				<sdk.camel.rest>6.2.0.6-oss</sdk.camel.rest>
-				<sdk.camunda.core>6.1.0.3-oss</sdk.camunda.core>
+
+				<eelf.core.version>1.0.0</eelf.core.version>
+				<camel.version>2.20.1</camel.version>
+				<springboot.version>1.5.9.RELEASE</springboot.version>
 
 				<sonar.language>java</sonar.language>
 				<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -145,11 +145,27 @@
 
 		<dependencyManagement>
 				<dependencies>
+						<!-- Spring Boot BOM -->
 						<dependency>
-								<!-- Import dependency management from Spring Boot -->
 								<groupId>org.springframework.boot</groupId>
 								<artifactId>spring-boot-dependencies</artifactId>
-								<version>1.4.1.RELEASE</version>
+								<version>${springboot.version}</version>
+								<type>pom</type>
+								<scope>import</scope>
+						</dependency>
+						<!-- Camunda BOM -->
+						<dependency>
+								<groupId>org.camunda.bpm</groupId>
+								<artifactId>camunda-bom</artifactId>
+								<version>7.6.0</version>
+								<scope>import</scope>
+								<type>pom</type>
+						</dependency>
+						<!-- Camel BOM -->
+						<dependency>
+								<groupId>org.apache.camel</groupId>
+								<artifactId>camel-spring-boot-dependencies</artifactId>
+								<version>${camel.version}</version>
 								<type>pom</type>
 								<scope>import</scope>
 						</dependency>
@@ -158,60 +174,83 @@
 
 		<dependencies>
 				<dependency>
-						<groupId>commons-io</groupId>
-						<artifactId>commons-io</artifactId>
-						<version>2.6</version>
+						<groupId>com.att.eelf</groupId>
+						<artifactId>eelf-core</artifactId>
+						<version>${eelf.core.version}</version>
 				</dependency>
+				<!-- For CAMEL -->
 				<dependency>
-						<groupId>com.googlecode.json-simple</groupId>
-						<artifactId>json-simple</artifactId>
-						<version>1.1</version>
+						<groupId>org.apache.camel</groupId>
+						<artifactId>camel-spring-boot-starter</artifactId>
+
 				</dependency>
 				<dependency>
-						<groupId>org.apache.commons</groupId>
-						<artifactId>commons-vfs2</artifactId>
-						<version>2.0</version>
+						<groupId>org.apache.camel</groupId>
+						<artifactId>camel-jaxb-starter</artifactId>
 				</dependency>
-
 				<dependency>
-						<groupId>org.springframework.security</groupId>
-						<artifactId>spring-security-test</artifactId>
-
-						<scope>test</scope>
+						<groupId>org.apache.camel</groupId>
+						<artifactId>camel-cxf-starter</artifactId>
 				</dependency>
-
-
-				<!-- Dependencies of parent pom start -->
+				<!-- Spring famework -->
 				<dependency>
-						<groupId>com.att.ajsc</groupId>
-						<artifactId>sdk-java-common-logging</artifactId>
-						<version>${sdk.java.common.logging}</version>
+						<groupId>org.springframework.boot</groupId>
+						<artifactId>spring-boot-starter-web</artifactId>
 				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-starter-tomcat</artifactId>
-						<scope>compile</scope>
 				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-actuator</artifactId>
+						<artifactId>spring-boot-starter-jersey</artifactId>
+				</dependency>
+				<dependency>
+						<groupId>org.springframework</groupId>
+						<artifactId>spring-jdbc</artifactId>
 				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-starter-security</artifactId>
 				</dependency>
+				<dependency>
+						<groupId>org.springframework.boot</groupId>
+						<artifactId>spring-boot-starter-actuator</artifactId>
+				</dependency>
 				<dependency>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-starter-test</artifactId>
 						<scope>test</scope>
 				</dependency>
+
+				<!-- For CAmunda -->
 				<dependency>
-						<groupId>joda-time</groupId>
-						<artifactId>joda-time</artifactId>
+						<groupId>org.camunda.bpm.extension.springboot</groupId>
+						<artifactId>camunda-bpm-spring-boot-starter</artifactId>
+						<version>2.0.0</version>
 				</dependency>
 				<dependency>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-context</artifactId>
+						<groupId>org.camunda.bpm.extension.springboot</groupId>
+						<artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
+						<version>2.0.0</version>
+				</dependency>
+				<dependency>
+						<groupId>commons-io</groupId>
+						<artifactId>commons-io</artifactId>
+						<version>2.6</version>
+				</dependency>
+				<dependency>
+						<groupId>com.googlecode.json-simple</groupId>
+						<artifactId>json-simple</artifactId>
+				</dependency>
+				<dependency>
+						<groupId>org.apache.commons</groupId>
+						<artifactId>commons-vfs2</artifactId>
+						<version>2.0</version>
+				</dependency>
+				<dependency>
+						<groupId>joda-time</groupId>
+						<artifactId>joda-time</artifactId>
 				</dependency>
 				<dependency>
 						<groupId>org.slf4j</groupId>
@@ -222,10 +261,6 @@
 						<artifactId>javax.ws.rs-api</artifactId>
 						<version>2.0</version>
 				</dependency>
-				<dependency>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-test</artifactId>
-				</dependency>
 				<dependency>
 						<groupId>junit</groupId>
 						<artifactId>junit</artifactId>
@@ -235,15 +270,6 @@
 						<artifactId>mockito-all</artifactId>
 						<version>1.9.5</version>
 				</dependency>
-				<dependency>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-						<version>1.1.1</version>
-				</dependency>
-				<dependency>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-aspects</artifactId>
-				</dependency>
 				<dependency>
 						<groupId>com.fasterxml.jackson.core</groupId>
 						<artifactId>jackson-core</artifactId>
@@ -252,27 +278,6 @@
 						<groupId>com.fasterxml.jackson.core</groupId>
 						<artifactId>jackson-databind</artifactId>
 				</dependency>
-				<dependency>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-webmvc</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-starter-web</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>log4j</groupId>
-						<artifactId>log4j</artifactId>
-						<version>1.2.17</version>
-				</dependency>
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot</artifactId>
-				</dependency>
-				<dependency>
-						<groupId>org.springframework.boot</groupId>
-						<artifactId>spring-boot-autoconfigure</artifactId>
-				</dependency>
 				<dependency>
 						<groupId>javax.transaction</groupId>
 						<artifactId>jta</artifactId>
@@ -288,57 +293,16 @@
 						<artifactId>hibernate-annotations</artifactId>
 						<version>3.5.6-Final</version>
 				</dependency>
-				<dependency>
-						<groupId>org.apache.geronimo.specs</groupId>
-						<artifactId>geronimo-jpa_2.0_spec</artifactId>
-						<version>1.1</version>
-				</dependency>
+				<!-- <dependency> -->
+				<!-- <groupId>org.apache.geronimo.specs</groupId> -->
+				<!-- <artifactId>geronimo-jpa_2.0_spec</artifactId> -->
+				<!-- <version>1.1</version> -->
+				<!-- </dependency> -->
 				<dependency>
 						<groupId>dom4j</groupId>
 						<artifactId>dom4j</artifactId>
-						<version>1.6.1</version>
-				</dependency>
-				<!-- Dependencies of parent pom end -->
-				<dependency>
-						<groupId>com.att.ajsc</groupId>
-						<artifactId>sdk-java-camel-rest</artifactId>
-						<version>${sdk.camel.rest}</version>
 				</dependency>
 
-				<!-- Camunda Core -->
-				<dependency>
-						<groupId>com.att.ajsc</groupId>
-						<artifactId>sdk-java-camunda-core</artifactId>
-						<version>${sdk.camunda.core}</version>
-						<exclusions>
-								<exclusion>
-										<groupId>mysql</groupId>
-										<artifactId>mysql-connector-java</artifactId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-				<!-- Spring Mail -->
-				<dependency>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-context-support</artifactId>
-				</dependency>
-				<!-- CSI Logging -->
-				<dependency>
-						<groupId>com.att.ajsc</groupId>
-						<artifactId>sdk-java-common-interceptors</artifactId>
-						<version>${csi.logging}</version>
-						<exclusions>
-								<exclusion>
-										<groupId>org.eclipse.jetty.orbit</groupId>
-										<artifactId>javax.servlet</artifactId>
-								</exclusion>
-								<exclusion>
-										<groupId>com.att.ajsc</groupId>
-										<artifactId>ajsc-core</artifactId>
-								</exclusion>
-						</exclusions>
-				</dependency>
-				<!-- CSI Logging End -->
 				<dependency>
 						<groupId>org.onap.policy.engine</groupId>
 						<artifactId>PolicyEngineAPI</artifactId>
@@ -364,6 +328,10 @@
 										<groupId>mysql</groupId>
 										<artifactId>mysql-connector-java</artifactId>
 								</exclusion>
+								<exclusion>
+										<groupId>commons-io</groupId>
+										<artifactId>commons-io</artifactId>
+								</exclusion>
 						</exclusions>
 				</dependency>
 				<dependency>
@@ -402,6 +370,14 @@
 										<artifactId>apache-log4j-extras</artifactId>
 										<groupId>log4j</groupId>
 								</exclusion>
+								<exclusion>
+										<groupId>mysql</groupId>
+										<artifactId>mysql-connector-java</artifactId>
+								</exclusion>
+								<exclusion>
+										<groupId>org.mariadb.jdbc</groupId>
+										<artifactId>mariadb-java-client</artifactId>
+								</exclusion>
 						</exclusions>
 				</dependency>
 				<dependency>
@@ -464,23 +440,16 @@
 				<dependency>
 						<groupId>com.fasterxml.jackson.core</groupId>
 						<artifactId>jackson-databind</artifactId>
-						<version>2.6.3</version>
 				</dependency>
 				<dependency>
 						<groupId>com.fasterxml.jackson.dataformat</groupId>
 						<artifactId>jackson-dataformat-yaml</artifactId>
-						<version>2.6.3</version>
 				</dependency>
 				<dependency>
 						<groupId>org.apache.commons</groupId>
 						<artifactId>commons-csv</artifactId>
 						<version>1.3</version>
 				</dependency>
-				<dependency>
-						<groupId>org.jboss.resteasy</groupId>
-						<artifactId>resteasy-client</artifactId>
-						<version>3.0.8.Final</version>
-				</dependency>
 				<dependency>
 						<groupId>com.sun.faces</groupId>
 						<artifactId>jsf-api</artifactId>
@@ -596,7 +565,7 @@
 						<plugin>
 								<groupId>org.springframework.boot</groupId>
 								<artifactId>spring-boot-maven-plugin</artifactId>
-								<version>1.5.3.RELEASE</version>
+								<version>${springboot.version}</version>
 								<executions>
 										<execution>
 												<goals>
-- 
cgit 1.2.3-korg