X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=common%2Fpom.xml;h=6bd142ddb2222c90db07e54823937529318046e1;hb=9484ccd079c2818f040a9b15fe744f6845efb76a;hp=ca2c20df7a3670d8e82c555f9b8a328748709e93;hpb=00da3f4b4087e78d56f09dfe8ab01616d6ad68b0;p=so.git

diff --git a/common/pom.xml b/common/pom.xml
index ca2c20df7a..6bd142ddb2 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
         <groupId>org.onap.so</groupId>
         <artifactId>so</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>common</artifactId>
 	<name>MSO Common classes</name>
@@ -17,27 +17,10 @@
 		<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>org.springframework.boot</groupId>
@@ -46,38 +29,27 @@
 		<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>        		
+        </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>
-		</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>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.aai.aai-common</groupId>
+    		<groupId>org.springframework</groupId>
+    		<artifactId>spring-webmvc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.aai.schema-service</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>
+			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.modelmapper</groupId>
@@ -87,27 +59,16 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-
 		</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>
-		</dependency>
-		<dependency>
-    		<groupId>org.apache.cxf</groupId>
-    		<artifactId>cxf-rt-bindings-soap</artifactId>
-  			<version>${cxf.version}</version>
-		</dependency>
-		<dependency>
-    		<groupId>org.apache.cxf</groupId>
-    		<artifactId>cxf-rt-transports-http</artifactId>
-    		<version>${cxf.version}</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.shazam</groupId>
@@ -125,29 +86,14 @@
 				</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>
 		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
 		</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>
@@ -161,19 +107,30 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>5.0.5.RELEASE</version>
         </dependency>
 		<dependency>
 			<groupId>org.onap.logging-analytics</groupId>
   			<artifactId>logging-slf4j</artifactId>
-  			<version>1.2.2-SNAPSHOT</version>
-  			<exclusions>
-				<exclusion>
-					<groupId>com.att.eelf</groupId>
-					<artifactId>eelf-core</artifactId>
-				</exclusion>
-			</exclusions>
+  			<version>1.2.2</version>
   		</dependency>
+  		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+		</dependency>
+		<dependency>
+				<groupId>org.json</groupId>
+				<artifactId>json</artifactId>
+			</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
+			<version>0.9.11</version>
+		</dependency>
     </dependencies>
 	<build>
 		<resources>
@@ -187,6 +144,36 @@
 					<include>**/*.java</include>
 				</includes>
 			</resource>
-		</resources>		
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-test</id>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<includes>
+								<include>**/NonSpringSuite.java</include>
+							</includes>	
+						</configuration>
+					</execution>
+					<execution>
+						<id>spring-tests</id>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<includes>
+								<include>**/SpringSuite.java</include>
+							</includes>	
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>	
 	</build>
 </project>