X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=reference%2Flogging-filter%2Fpom.xml;h=a25c9a5a3fb1434ca457f9fc0ea5c9d88bb60c3c;hb=2ab194ebd99962804cfb977d3a3b8f8d732d22f0;hp=8f7e5fb4d9f3edafaaff4c0ac7579c49c3746ee4;hpb=c49a641f6457b97d9f27be53cbbc53f335fe2b27;p=logging-analytics.git

diff --git a/reference/logging-filter/pom.xml b/reference/logging-filter/pom.xml
index 8f7e5fb..a25c9a5 100644
--- a/reference/logging-filter/pom.xml
+++ b/reference/logging-filter/pom.xml
@@ -1,263 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.onap.logging-analytics</groupId>
-        <artifactId>logging-reference</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>logging-filter-parent</artifactId>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>logging-filter-base</module>
-        <module>logging-filter-spring</module>
-    </modules>
+  <parent>
+    <groupId>org.onap.logging-analytics</groupId>
+    <artifactId>logging-reference</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
+  </parent>
 
-    <properties>
-        <format.skipValidate>false</format.skipValidate>
-        <format.skipExecute>true</format.skipExecute>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+  <artifactId>logging-filter-parent</artifactId>
+  <packaging>pom</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>javax.annotation</groupId>
-                <artifactId>javax.annotation-api</artifactId>
-                <version>1.2</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.logging-analytics</groupId>
-                <artifactId>logging-slf4j</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>3.1.0</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>javax.ws.rs</groupId>
-                <artifactId>javax.ws.rs-api</artifactId>
-                <version>2.0.1</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.25</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-slf4j-impl</artifactId>
-                <version>2.11.2</version>
-                <scope>test</scope>
-            </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.15.0</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <modules>
+    <module>logging-filter-base</module>
+    <module>logging-filter-spring</module>
+  </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.5.1</version>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>default-testCompile</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <showWarnings>true</showWarnings>
-                    <compilerArgument>-parameters</compilerArgument>
-                    <compilerArgument>-Xlint:deprecation</compilerArgument>
-                </configuration>
-            </plugin>
+  <properties>
+    <format.skipValidate>false</format.skipValidate>
+    <format.skipExecute>true</format.skipExecute>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-            <!-- Plugin to identify root path of the project -->
-            <plugin>
-                <groupId>org.commonjava.maven.plugins</groupId>
-                <artifactId>directory-maven-plugin</artifactId>
-                <version>0.2</version>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <id>directories</id>
-                        <goals>
-                            <goal>highest-basedir</goal>
-                        </goals>
-                        <configuration>
-                            <property>baseDirPath</property>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Plugin to Generate/Validate Copyright License header -->
-            <!--
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>1.20</version>
-                <configuration>
-                    <processStartTag>============LICENSE_START=======================================================</processStartTag>
-                    <sectionDelimiter>================================================================================</sectionDelimiter>
-                    <processEndTag>============LICENSE_END=========================================================</processEndTag>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>1.2</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.onap.logging-analytics</groupId>
+        <artifactId>logging-slf4j</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.1.0</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>javax.ws.rs</groupId>
+        <artifactId>javax.ws.rs-api</artifactId>
+        <version>2.0.1</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.7.25</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-slf4j-impl</artifactId>
+        <version>2.11.2</version>
+        <scope>test</scope>
+      </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.15.0</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
-                    <licenseName>apache_v2</licenseName>
-                    <inceptionYear>2019</inceptionYear>
-                    <organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
-                    <projectName>ONAP - Logging</projectName>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <!-- Plugin to identify root path of the project -->
+      <plugin>
+        <groupId>org.commonjava.maven.plugins</groupId>
+        <artifactId>directory-maven-plugin</artifactId>
+        <version>0.2</version>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <id>directories</id>
+            <goals>
+              <goal>highest-basedir</goal>
+            </goals>
+            <configuration>
+              <property>baseDirPath</property>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
-                    <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-                    <skipUpdateLicense>${format.skipExecute}</skipUpdateLicense>
-                    <skipCheckLicense>${format.skipValidate}</skipCheckLicense>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>update-headers</id>
-                        <goals>
-                            <goal>update-file-header</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <canUpdateCopyright>true</canUpdateCopyright>
-                            <canUpdateDescription>true</canUpdateDescription>
-                            <canUpdateLicense>true</canUpdateLicense>
-                            <emptyLineAfterHeader>true</emptyLineAfterHeader>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>check-headers</id>
-                        <goals>
-                            <goal>check-file-header</goal>
-                        </goals>
-                        <phase>validate</phase>
-                        <configuration>
-                            <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
-                            <failOnMissingHeader>true</failOnMissingHeader>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
+      <!-- Plugin to Generate/Validate Copyright License header -->
+      <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> <version>1.20</version> <configuration> <processStartTag>============LICENSE_START=======================================================</processStartTag> 
+        <sectionDelimiter>================================================================================</sectionDelimiter> <processEndTag>============LICENSE_END=========================================================</processEndTag> 
+        <licenseName>apache_v2</licenseName> <inceptionYear>2019</inceptionYear> <organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName> <projectName>ONAP 
+        - Logging</projectName> <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> <skipUpdateLicense>${format.skipExecute}</skipUpdateLicense> <skipCheckLicense>${format.skipValidate}</skipCheckLicense> 
+        </configuration> <executions> <execution> <id>update-headers</id> <goals> <goal>update-file-header</goal> </goals> <phase>process-sources</phase> <configuration> <canUpdateCopyright>true</canUpdateCopyright> 
+        <canUpdateDescription>true</canUpdateDescription> <canUpdateLicense>true</canUpdateLicense> <emptyLineAfterHeader>true</emptyLineAfterHeader> </configuration> </execution> <execution> 
+        <id>check-headers</id> <goals> <goal>check-file-header</goal> </goals> <phase>validate</phase> <configuration> <failOnNotUptodateHeader>true</failOnNotUptodateHeader> <failOnMissingHeader>true</failOnMissingHeader> 
+        </configuration> </execution> </executions> </plugin> -->
 
-            <!-- Plugin to Format/Validate Java Classes -->
-            <plugin>
-                <groupId>net.revelc.code.formatter</groupId>
-                <artifactId>formatter-maven-plugin</artifactId>
-                <version>2.10.0</version>
-                <executions>
-                    <execution>
-                        <id>format-java</id>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                        <configuration>
-                            <lineEnding>LF</lineEnding>
-                            <skip>${format.skipExecute}</skip>
-                            <sourceDirectory>${project.basedir}</sourceDirectory>
-                            <configFile>${baseDirPath}/project-configs/code-tools/onap-java-format.xml</configFile>
-                            <includes>
-                                <include>src/**/*.java</include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>validate-java</id>
-                        <goals>
-                            <goal>validate</goal>
-                        </goals>
-                        <phase>validate</phase>
-                        <configuration>
-                            <lineEnding>LF</lineEnding>
-                            <skip>${format.skipValidate}</skip>
-                            <sourceDirectory>${project.basedir}</sourceDirectory>
-                            <configFile>${baseDirPath}/project-configs/code-tools/onap-java-format.xml</configFile>
-                            <includes>
-                                <include>src/**/*.java</include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-annotations</artifactId>
-                        <version>2.9.8</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
+      <!-- Plugin to Format/Validate Java Classes -->
+      <plugin>
+        <groupId>net.revelc.code.formatter</groupId>
+        <artifactId>formatter-maven-plugin</artifactId>
+        <version>2.10.0</version>
+        <executions>
+          <execution>
+            <id>format-java</id>
+            <goals>
+              <goal>format</goal>
+            </goals>
+            <phase>process-sources</phase>
+            <configuration>
+              <lineEnding>LF</lineEnding>
+              <skip>${format.skipExecute}</skip>
+              <sourceDirectory>${project.basedir}</sourceDirectory>
+              <configFile>${baseDirPath}/project-configs/code-tools/onap-java-format.xml</configFile>
+              <includes>
+                <include>src/**/*.java</include>
+              </includes>
+            </configuration>
+          </execution>
+          <execution>
+            <id>validate-java</id>
+            <goals>
+              <goal>validate</goal>
+            </goals>
+            <phase>validate</phase>
+            <configuration>
+              <lineEnding>LF</lineEnding>
+              <skip>${format.skipValidate}</skip>
+              <sourceDirectory>${project.basedir}</sourceDirectory>
+              <configFile>${baseDirPath}/project-configs/code-tools/onap-java-format.xml</configFile>
+              <includes>
+                <include>src/**/*.java</include>
+              </includes>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.9.8</version>
+          </dependency>
+        </dependencies>
+      </plugin>
 
-            <!-- Plugin to Format/Validate POM Files -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>tidy-maven-plugin</artifactId>
-                <version>1.1.0</version>
-                <executions>
-                    <execution>
-                        <id>format-pom</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>pom</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${format.skipExecute}</skip>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>validate-pom</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${format.skipValidate}</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+      <!-- Plugin to Format/Validate POM Files -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tidy-maven-plugin</artifactId>
+        <version>1.1.0</version>
+        <executions>
+          <execution>
+            <id>format-pom</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>pom</goal>
+            </goals>
+            <configuration>
+              <skip>${format.skipExecute}</skip>
+            </configuration>
+          </execution>
+          <execution>
+            <id>validate-pom</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <skip>${format.skipValidate}</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
-    <profiles>
-        <profile>
-            <id>format</id>
-            <properties>
-                <format.skipValidate>true</format.skipValidate>
-                <format.skipExecute>false</format.skipExecute>
-            </properties>
-        </profile>
-    </profiles>
+  <profiles>
+    <profile>
+      <id>format</id>
+      <properties>
+        <format.skipValidate>true</format.skipValidate>
+        <format.skipExecute>false</format.skipExecute>
+      </properties>
+    </profile>
+  </profiles>
 </project>