Upgrade SNAPSHOT to 1.2.2

[policy/engine.git] / LogParser / pom.xml

diff --git a/LogParser/pom.xml b/LogParser/pom.xml
index 16c58dd..e887bf0 100644 (file)
--- a/LogParser/pom.xml
+++ b/LogParser/pom.xml
@@ -22,14 +22,12 @@
 <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>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
        <artifactId>LogParser</artifactId>
-       
        <dependencies>
                <dependency>
             <groupId>com.h2database</groupId>
@@ -44,27 +42,11 @@
                        <groupId>org.onap.policy.common</groupId>
                        <artifactId>ONAP-Logging</artifactId>
                        <version>${project.version}</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>org.onap.policy.common</groupId>
                        <artifactId>integrity-monitor</artifactId>
                        <version>${project.version}</version>                   
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.powermock</groupId>
-                                       <artifactId>powermock-api-mockito</artifactId>
-                               </exclusion>
-                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.apache.logging.log4j</groupId>
@@ -74,7 +56,7 @@
                <dependency>
                        <groupId>org.apache.logging.log4j</groupId>
                        <artifactId>log4j-core</artifactId>
-                       <version>2.4</version>
+                       <version>2.8.2</version>
                </dependency>
                <dependency>
                        <groupId>org.eclipse.persistence</groupId>
@@ -86,23 +68,6 @@
                        <artifactId>eclipselink</artifactId>
                        <version>2.6.0</version>
                </dependency>
-                               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.11</version>
-                       <scope>test</scope>
-               </dependency>   
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <version>2.7.22</version>
-               </dependency>
-               <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
-               <dependency>
-                   <groupId>org.mockito</groupId>
-                   <artifactId>mockito-all</artifactId>
-                   <version>1.10.19</version>
-               </dependency> 
                <dependency>
                        <groupId>org.onap.policy.engine</groupId>
                        <artifactId>PolicyEngineUtils</artifactId>
@@ -125,23 +90,11 @@
                                        <artifactId>cambriaClient</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>com.att.cadi</groupId>
+                                       <groupId>org.onap.aaf.cadi</groupId>
                                        <artifactId>cadi-aaf</artifactId>
                                </exclusion>
                        </exclusions>
                </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-module-junit4</artifactId>
-                       <version>1.7.3</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-api-mockito2</artifactId>
-                       <version>1.7.3</version>
-                       <scope>test</scope>
-               </dependency>
        </dependencies>
        <build>
                <plugins>
@@ -172,6 +125,42 @@
                                        </execution>
                                </executions>
                </plugin>
+               <plugin>
+                               <artifactId>maven-checkstyle-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>onap-java-style</id>
+                                               <goals>
+                                                       <goal>check</goal>
+                                               </goals>
+                                               <phase>process-sources</phase>
+                                               <configuration>
+                                                       <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
+                                                               with minor changes -->
+                                                       <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+                                                       <!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
+                                                               sources directory -->
+                                                       <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                                                       <includeResources>true</includeResources>
+                                                       <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                                                       <includeTestResources>true</includeTestResources>
+                                                       <excludes>
+                                                       </excludes>
+                                                       <consoleOutput>true</consoleOutput>
+                                                       <failOnViolation>true</failOnViolation>
+                                                       <violationSeverity>warning</violationSeverity>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.onap.oparent</groupId>
+                                               <artifactId>checkstyle</artifactId>
+                                               <version>0.1.1</version>
+                                               <scope>compile</scope>
+                                       </dependency>
+                               </dependencies>
+                       </plugin>
                </plugins>
        </build>
 </project>