From 5a6a6de6f1a26a1897e4917a0df613e25a24eb70 Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Mon, 30 Jul 2018 15:56:09 -0400
Subject: Containerization feature of SO

Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 common/pom.xml | 346 +++++++++++++++++++++++----------------------------------
 1 file changed, 138 insertions(+), 208 deletions(-)

(limited to 'common/pom.xml')

diff --git a/common/pom.xml b/common/pom.xml
index 86b9f36e50..8a5f5a2e37 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,155 +1,110 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
         <groupId>org.onap.so</groupId>
         <artifactId>so</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>common</artifactId>
-    <name>MSO Common classes</name>
-    <description>MSO Common classes:- Logger</description>
-	<properties>
-		<spring.version>4.3.2.RELEASE</spring.version>
-	</properties>
-    <dependencies>
-        <dependency>
-            <groupId>com.att.eelf</groupId>
-            <artifactId>eelf-core</artifactId>
-            <version>0.0.1</version>
-            <exclusions>
-            	<exclusion>
-            		<groupId>org.powermock</groupId>
-            		<artifactId>powermock-module-junit4</artifactId>
-            	</exclusion>
-            	<exclusion>
-            		<groupId>org.powermock</groupId>
-            		<artifactId>powermock-api-mockito</artifactId>
-            	</exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.spec.javax.ejb</groupId>
-            <artifactId>jboss-ejb-api_3.2_spec</artifactId>
-            <version>1.0.0.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.ejb3</groupId>
-            <artifactId>jboss-ejb3-ext-api</artifactId>
-            <version>2.2.0.Final</version>
-            <scope>provided</scope>
-        </dependency>
+        <version>1.3.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>common</artifactId>
+	<name>MSO Common classes</name>
+	<description>MSO Common classes:- Logger</description>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.8.7</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.8.7</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<version>2.4.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aspects</artifactId>
 			<version>3.1.2.RELEASE</version>
 		</dependency>
 		<dependency>
-			<groupId>com.openpojo</groupId>
-			<artifactId>openpojo</artifactId>
-			<version>0.8.6</version>
-		</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>com.jayway.jsonpath</groupId>
 			<artifactId>json-path</artifactId>
 			<version>2.2.0</version>
 		</dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>4.3.6.Final</version>
-            <exclusions>
-                <!-- Avoid hibernate inclusion as provided in Jboss -->
-                <exclusion>
-                    <groupId>org.jboss</groupId>
-                    <artifactId>jandex</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.javassist</groupId>
-                    <artifactId>javassist</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.logging</groupId>
-                    <artifactId>jboss-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.logging</groupId>
-                    <artifactId>jboss-logging-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.spec.javax.transaction</groupId>
-                    <artifactId>jboss-transaction-api_1.2_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>antlr</groupId>
-                    <artifactId>antlr</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>dom4j</groupId>
-                    <artifactId>dom4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>4.3.6.Final</version>
+		</dependency>
+		<dependency>
 			<groupId>com.wordnik</groupId>
 			<artifactId>swagger-annotations_2.9.1</artifactId>
 			<version>1.3.0</version>
 		</dependency>
-                <dependency>
-                    <groupId>org.onap.appc.client</groupId>
-                    <artifactId>client-kit</artifactId>
-                    <version>1.3.0</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.onap.appc.client</groupId>
-                    <artifactId>client-lib</artifactId>
-                    <version>1.3.0</version>
-                </dependency>
+		<dependency>
+			<groupId>org.onap.appc.client</groupId>
+			<artifactId>client-kit</artifactId>
+			<version>1.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.appc.client</groupId>
+			<artifactId>client-lib</artifactId>
+			<version>1.3.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
-                <dependency>
-                    <groupId>org.onap.aai.aai-common</groupId>
-                    <artifactId>aai-schema</artifactId>
-                    <version>1.2.1</version>
-                </dependency>
 		<dependency>
-	 	 	<groupId>org.modelmapper</groupId>
-	 		<artifactId>modelmapper</artifactId>
-		 	<version>1.1.0</version>
+			<groupId>org.onap.aai.aai-common</groupId>
+			<artifactId>aai-schema</artifactId>
+			<!-- TODO: replace with release a version when -->
+			<!-- org.onap.aai.domain.yang.Collection has -->
+			<!-- been released -->
+			<version>1.3.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.modelmapper</groupId>
+			<artifactId>modelmapper</artifactId>
+			<version>1.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<version>22.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-rs-client</artifactId>
+			<version>${cxf.version}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.shazam</groupId>
 			<artifactId>shazamcrest</artifactId>
@@ -166,94 +121,69 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!--for yang decoder -->
+		<!--<dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-codec-gson</artifactId> 
+			<version>1.1.1-Carbon</version> </dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> 
+			<artifactId>mdsal-binding-dom-adapter</artifactId> <version>2.2.1-Carbon</version> 
+			</dependency> <dependency> <groupId>org.opendaylight.mdsal</groupId> <artifactId>mdsal-dom-broker</artifactId> 
+			<version>2.2.1-Carbon</version> </dependency> <dependency> <groupId>org.opendaylight.netconf</groupId> 
+			<artifactId>sal-rest-connector</artifactId> <version>1.5.1-Carbon</version> 
+			</dependency> <dependency> <groupId>org.dom4j</groupId> <artifactId>dom4j</artifactId> 
+			<version>2.0.0</version> </dependency> -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-ext</artifactId>
+			<version>1.7.25</version>
+		</dependency>
 		<dependency>
-	      <groupId>log4j</groupId>
-	      <artifactId>log4j</artifactId>
-	      <version>1.2.17</version>
-	    </dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>1.2.3</version>
+		</dependency>
 		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.4</version>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>1.2.3</version>
 		</dependency>
-      <dependency>
-        <groupId>org.assertj</groupId>
-        <artifactId>assertj-core</artifactId>
-        <version>3.9.0</version>
-        <scope>test</scope>
-      </dependency>
-    </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.java</include>
-                </includes>
-            </resource>
-        </resources>
-	<plugins>
-		<plugin>
-			<groupId>com.att.eelf</groupId>
-			<artifactId>eelf-maven-plugin</artifactId>
-			<version>0.0.1</version>
-			<executions>
-				<execution>
-					<id>validate</id>
-					<phase>install</phase>
-					<goals>
-						<goal>ValidateApplicationMsgs</goal>
-					</goals>
-					<configuration>
-						<resources>
-							<resource>
-								<messageClass>org.openecomp.mso.logger.MessageEnum</messageClass>
-							</resource>
-						</resources>
-					</configuration>
-				</execution>
-				<execution>
-					<id>wiki</id>
-					<phase>install</phase>
-					<goals>
-						<goal>WikiMsgGenerator</goal>
-					</goals>
-					<configuration>
-						<outputDirectory>target/messages</outputDirectory>
-						<outputFile>messages.html</outputFile>
-						<wiki>
-							<title>Messages and Codes</title>
-							<space>APP</space>
-							<page>Messages and Codes</page>
-							<principal>test</principal>
-							<credentials>test</credentials>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
 
-						</wiki>
-						<resources>
-							<resource>
-								<messageClass>org.openecomp.mso.logger.MessageEnum</messageClass>
-								<header><![CDATA[<p>   <ac:macro ac:name="toc"/> </p>
-<!--                 <p> -->
-<!--         <ac:macro ac:name="anchor"> <ac:default-parameter>Application Messages</ac:default-parameter>  </ac:macro> </p> <h2>Application Messages</h2>]]></header>
-								-->
-							</resource>
-						</resources>
-					</configuration>
-				</execution>
-			</executions>
-			<dependencies>
-				<dependency>
-					<groupId>org.onap.so</groupId>
-					<artifactId>common</artifactId>
-					<version>${project.version}</version>
-				</dependency>
-			</dependencies>
+		</dependency>
+		<dependency>
+			<groupId>janino</groupId>
+			<artifactId>janino</artifactId>
+			<version>2.5.15</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>net.jodah</groupId>
+			<artifactId>failsafe</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+            <version>5.0.5.RELEASE</version>
+        </dependency>
 
-		</plugin>
-	</plugins>
-    </build>
+    </dependencies>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+			</resource>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.java</include>
+				</includes>
+			</resource>
+		</resources>		
+	</build>
 </project>
-- 
cgit 1.2.3-korg