Bugfixes for December 2018

[so.git] / common / pom.xml

diff --git a/common/pom.xml b/common/pom.xml
index 8b0f19c..7d468fa 100644 (file)
--- 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,12 +17,10 @@
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>javax.servlet-api</artifactId>
-                       <version>3.1.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>
@@ -31,26 +29,15 @@
                <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>
                </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>
@@ -62,7 +49,7 @@
                <dependency>
                        <groupId>org.onap.aai.aai-common</groupId>
                        <artifactId>aai-schema</artifactId>
-                       <version>1.3.1</version>
+                       <version>1.4.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.modelmapper</groupId>
@@ -72,12 +59,10 @@
                <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>
@@ -101,20 +86,10 @@
                                </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>
@@ -132,13 +107,25 @@
         <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</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>
     </dependencies>
        <build>
                <resources>
@@ -152,6 +139,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>