10/31: merge casablanca to master

[so.git] / common / pom.xml

diff --git a/common/pom.xml b/common/pom.xml
index d2dba45..735b132 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>
@@ -62,7 +62,7 @@
                <dependency>
                        <groupId>org.onap.aai.aai-common</groupId>
                        <artifactId>aai-schema</artifactId>
-                       <version>1.3.1-SNAPSHOT</version>
+                       <version>1.3.1</version>
                </dependency>
                <dependency>
                        <groupId>org.modelmapper</groupId>
@@ -137,14 +137,13 @@
                <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.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-test</artifactId>
+                       <scope>test</scope>
+               </dependency>
     </dependencies>
        <build>
                <resources>
@@ -158,6 +157,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>