Code Review / logging-analytics.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: c49a641)
pom changes 62/100262/1
authorSmokowski, Kevin (ks6305) <kevin.smokowski@att.com>
Mon, 13 Jan 2020 19:16:57 +0000 (19:16 +0000)
committerSmokowski, Kevin (ks6305) <kevin.smokowski@att.com>
Mon, 13 Jan 2020 19:16:57 +0000 (19:16 +0000)
centralize maven compiler plugin config and organize poms

Issue-ID: LOG-1193
Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com>
Change-Id: I8e6526f5709ea5773dd3214adddda15614daaff5

14 files changed:
pom.xml patch | blob | history
pylog/pom.xml patch | blob | history
reference/logging-demo/pom.xml patch | blob | history
reference/logging-docker-root/pom.xml patch | blob | history
reference/logging-filter/logging-filter-base/pom.xml patch | blob | history
reference/logging-filter/logging-filter-spring/pom.xml patch | blob | history
reference/logging-filter/pom.xml patch | blob | history
reference/logging-kubernetes/pom.xml patch | blob | history
reference/logging-library/pom.xml patch | blob | history
reference/logging-mock-service/pom.xml patch | blob | history
reference/logging-slf4j-demo/pom.xml patch | blob | history
reference/logging-slf4j/pom.xml patch | blob | history
reference/pom.xml patch | blob | history
reference/provider/pom.xml patch | blob | history

diff --git a/pom.xml b/pom.xml
index 813fb9d..06db3b3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0"?>
 <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.oparent</groupId>
-      <artifactId>oparent</artifactId>
-      <version>2.0.0</version>
+    <groupId>org.onap.oparent</groupId>
+    <artifactId>oparent</artifactId>
+    <version>2.0.0</version>
   </parent>
+
   <groupId>org.onap.logging-analytics</groupId>
   <artifactId>logging-analytics</artifactId>
-  <packaging>pom</packaging>
   <version>1.6.3-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
   <name>logging-analytics</name>
-  <url>http://maven.apache.org</url>
+
   <modules>
     <module>reference</module>
     <module>pylog</module>
diff --git a/pylog/pom.xml b/pylog/pom.xml
index f68151a..f886bfa 100644 (file)
--- a/pylog/pom.xml
+++ b/pylog/pom.xml
@@ -11,21 +11,23 @@
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 -->
-<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">
+<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.oparent</groupId>
       <artifactId>oparent</artifactId>
       <version>2.0.0</version>
     </parent>
+
     <groupId>org.onap.logging-analytics</groupId>
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>logging-pylog</artifactId>
     <version>1.6.1</version>
     <packaging>pom</packaging>
+
     <name>logging-pylog</name>
     <description>onap python logging library</description>
+
     <build>
         <plugins>
             <plugin>
diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml
index dec4c4b..4016c3a 100644 (file)
--- a/reference/logging-demo/pom.xml
+++ b/reference/logging-demo/pom.xml
@@ -1,112 +1,62 @@
+<?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>
+
   <parent>
-      <groupId>org.onap.logging-analytics</groupId>
-      <artifactId>logging-reference</artifactId>
-      <version>1.6.3-SNAPSHOT</version>
+    <groupId>org.onap.logging-analytics</groupId>
+    <artifactId>logging-reference</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
   </parent>
+
   <artifactId>logging-demo</artifactId>
   <packaging>war</packaging>
+
   <name>logging-demo</name>
+
   <properties>
-       <jackson-2-version>2.8.6</jackson-2-version>
-       <!-- https://mvnrepository.com/artifact/org.springframework/spring-aop/5.0.5.RELEASE -->
-       <spring.version>5.1.2.RELEASE</spring.version>
-       <logback.version>1.2.3</logback.version>
+    <jackson-2-version>2.8.6</jackson-2-version>
+    <!-- https://mvnrepository.com/artifact/org.springframework/spring-aop/5.0.5.RELEASE -->
+    <spring.version>5.1.2.RELEASE</spring.version>
+    <logback.version>1.2.3</logback.version>
   </properties>
-  <build>
-      <plugins>
-                    <!-- Checkstyle plugin - used to report on compliance with -->
-              <!-- the Google style guide. -->
-              <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-site-plugin</artifactId>
-              </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-      <pluginManagement>
-       <plugins>
-               <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-               <plugin>
-                       <groupId>org.eclipse.m2e</groupId>
-                       <artifactId>lifecycle-mapping</artifactId>
-                       <version>1.0.0</version>
-                       <configuration>
-                               <lifecycleMappingMetadata>
-                                       <pluginExecutions>
-                                               <pluginExecution>
-                                                       <pluginExecutionFilter>
-                                                               <groupId>
-                                                                       org.apache.maven.plugins
-                                                               </groupId>
-                                                               <artifactId>
-                                                                       maven-compiler-plugin
-                                                               </artifactId>
-                                                               <versionRange>
-                                                                       [3.2,)
-                                                               </versionRange>
-                                                               <goals>
-                                                                       <goal>testCompile</goal>
-                                                               </goals>
-                                                       </pluginExecutionFilter>
-                                                       <action>
-                                                               <ignore></ignore>
-                                                       </action>
-                                               </pluginExecution>
-                                       </pluginExecutions>
-                               </lifecycleMappingMetadata>
-                       </configuration>
-               </plugin>
-       </plugins>
-      </pluginManagement>
-  </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.logging-analytics</groupId>
-            <artifactId>logging-mock-service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
-
-            <!-- https://jersey.java.net/documentation/latest/modules-and-dependencies.html -->
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.logging-analytics</groupId>
+      <artifactId>logging-mock-service</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <!-- https://jersey.java.net/documentation/latest/modules-and-dependencies.html -->
     <dependency>
-        <groupId>javax.ws.rs</groupId>
-        <artifactId>javax.ws.rs-api</artifactId>
-        <version>2.0.1</version>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0.1</version>
     </dependency>
     <dependency>
-        <groupId>org.glassfish.jersey.containers</groupId>
-        <artifactId>jersey-container-servlet</artifactId>
-        <version>2.23</version>
+      <groupId>org.glassfish.jersey.containers</groupId>
+      <artifactId>jersey-container-servlet</artifactId>
+      <version>2.23</version>
     </dependency>
     <dependency>
-        <groupId>org.glassfish.jersey.core</groupId>
-        <artifactId>jersey-server</artifactId>
-        <version>2.23</version>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>2.23</version>
     </dependency>
     <dependency>
-        <groupId>org.glassfish.jersey.core</groupId>
-        <artifactId>jersey-client</artifactId>
-        <version>2.23</version>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-client</artifactId>
+      <version>2.23</version>
     </dependency>
     <dependency>
-        <groupId>org.glassfish.jersey.media</groupId>
-        <artifactId>jersey-media-multipart</artifactId>
-        <version>2.23</version>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-multipart</artifactId>
+      <version>2.23</version>
     </dependency>
     <!-- fixes http://stackoverflow.com/questions/23442440/messagebodyreader-not-found-for-media-type-application-json -->
     <dependency>
-        <groupId>org.glassfish.jersey.media</groupId>
-        <artifactId>jersey-media-json-jackson</artifactId>
-        <version>2.23</version>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-json-jackson</artifactId>
+      <version>2.23</version>
       <exclusions>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
@@ -116,183 +66,181 @@
     </dependency>
     <!-- for spring injection in rest -->
     <dependency>
-        <groupId>org.glassfish.jersey.ext</groupId>
-        <artifactId>jersey-spring3</artifactId>
-        <version>2.23</version>
-        <!-- for https://github.com/JakubStas/SpringWithSwagger/issues/2 -->
-        <exclusions>
-                <exclusion>
-                    <artifactId>spring-context</artifactId>
-                    <groupId>org.springframework</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>spring-core</artifactId>
-                    <groupId>org.springframework</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>spring-web</artifactId>
-                    <groupId>org.springframework</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>spring-beans</artifactId>
-                    <groupId>org.springframework</groupId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.glassfish.hk2.external</groupId>
-                  <artifactId>bean-validator</artifactId>
-                </exclusion>
-            </exclusions>
+      <groupId>org.glassfish.jersey.ext</groupId>
+      <artifactId>jersey-spring3</artifactId>
+      <version>2.23</version>
+      <!-- for https://github.com/JakubStas/SpringWithSwagger/issues/2 -->
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-context</artifactId>
+        </exclusion>
+        <exclusion>
+          <artifactId>spring-core</artifactId>
+          <groupId>org.springframework</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>spring-web</artifactId>
+          <groupId>org.springframework</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>spring-beans</artifactId>
+          <groupId>org.springframework</groupId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.glassfish.hk2.external</groupId>
+          <artifactId>bean-validator</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
-        <!-- json parsing -->
-<!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
- <dependency>
-   <groupId>com.fasterxml.jackson.core</groupId>
-   <artifactId>jackson-core</artifactId>
-   <version>${jackson-2-version}</version>
- </dependency>
-
- <!-- Just the annotations; use this dependency if you want to attach annotations
-      to classes without connecting them to the code. -->
- <dependency>
-   <groupId>com.fasterxml.jackson.core</groupId>
-   <artifactId>jackson-annotations</artifactId>
-   <version>${jackson-2-version}</version>
-</dependency>
-
-<!-- databinding; ObjectMapper, JsonNode and related classes are here -->
-<!--<dependency>
-  <groupId>com.fasterxml.jackson.core</groupId>
-  <artifactId>jackson-databind</artifactId>
-  <version>${jackson-2-version}</version>
-</dependency>-->
-
-<!-- smile (binary JSON). Other artifacts in this group do other formats. -->
-<dependency>
-  <groupId>com.fasterxml.jackson.dataformat</groupId>
-  <artifactId>jackson-dataformat-smile</artifactId>
-  <version>${jackson-2-version}</version>
-</dependency>
-<!-- JAX-RS provider -->
-<dependency>
-   <groupId>com.fasterxml.jackson.jaxrs</groupId>
-   <artifactId>jackson-jaxrs-json-provider</artifactId>
-   <version>${jackson-2-version}</version>
-  <exclusions>
-    <exclusion>
+    <!-- json parsing -->
+    <!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
+    <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </exclusion>
-  </exclusions>
-</dependency>
-<!-- Support for JAX-B annotations as additional configuration -->
-<dependency>
-  <groupId>com.fasterxml.jackson.module</groupId>
-  <artifactId>jackson-module-jaxb-annotations</artifactId>
-  <version>${jackson-2-version}</version>
-  <exclusions>
-    <exclusion>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson-2-version}</version>
+    </dependency>
+    <!-- Just the annotations; use this dependency if you want to attach annotations to classes without connecting them to the code. -->
+    <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </exclusion>
-  </exclusions>
-</dependency>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson-2-version}</version>
+    </dependency>
+    <!-- databinding; ObjectMapper, JsonNode and related classes are here -->
+    <!--<dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <version>${jackson-2-version}</version> </dependency> -->
+    <!-- smile (binary JSON). Other artifacts in this group do other formats. -->
     <dependency>
-        <groupId>com.owlike</groupId>
-        <artifactId>genson</artifactId>
-        <version>1.1</version>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-smile</artifactId>
+      <version>${jackson-2-version}</version>
+    </dependency>
+    <!-- JAX-RS provider -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+      <version>${jackson-2-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <!-- Support for JAX-B annotations as additional configuration -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jaxb-annotations</artifactId>
+      <version>${jackson-2-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.owlike</groupId>
+      <artifactId>genson</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-oxm</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+      <!--scope>test</scope -->
     </dependency>
-    <!-- dependency>
-        <groupId>org.eclipse.persistence</groupId>
-        <artifactId>javax.persistence</artifactId>
-        <version>2.0.0</version>
-    </dependency-->
-
     <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>3.0.1</version>
-        <scope>provided</scope>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aspects</artifactId>
+      <version>${spring.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback.version}</version>
+    </dependency>
+    <!-- JUnit 4.12 used to come with EELF -->
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.6.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-       <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-oxm</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-            <!--scope>test</scope-->
-        </dependency>
-        <dependency>
-     <groupId>org.springframework</groupId>
-     <artifactId>spring-aspects</artifactId>
-     <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>1.9.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-        </dependency>
-        <!-- JUnit 4.12 used to come with EELF -->
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/reference/logging-docker-root/pom.xml b/reference/logging-docker-root/pom.xml
index 5eb9b5d..1c2d482 100644 (file)
--- a/reference/logging-docker-root/pom.xml
+++ b/reference/logging-docker-root/pom.xml
@@ -1,12 +1,15 @@
-<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">
+<?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>
+
   <parent>
-      <groupId>org.onap.logging-analytics</groupId>
-      <artifactId>logging-reference</artifactId>
-      <version>1.6.3-SNAPSHOT</version>
+    <groupId>org.onap.logging-analytics</groupId>
+    <artifactId>logging-reference</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
   </parent>
+
   <artifactId>logging-docker-root</artifactId>
   <packaging>pom</packaging>
+
   <name>logging-docker-root</name>
 </project>
diff --git a/reference/logging-filter/logging-filter-base/pom.xml b/reference/logging-filter/logging-filter-base/pom.xml
index 718441f..e01ea0c 100644 (file)
--- a/reference/logging-filter/logging-filter-base/pom.xml
+++ b/reference/logging-filter/logging-filter-base/pom.xml
@@ -1,62 +1,62 @@
 <?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-filter-parent</artifactId>
-               <version>1.6.3-SNAPSHOT</version>
-       </parent>
+  <parent>
+    <groupId>org.onap.logging-analytics</groupId>
+    <artifactId>logging-filter-parent</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
+  </parent>
 
-       <artifactId>logging-filter-base</artifactId>
+  <artifactId>logging-filter-base</artifactId>
 
-       <dependencies>
-               <dependency>
-                       <groupId>javax.annotation</groupId>
-                       <artifactId>javax.annotation-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.logging-analytics</groupId>
-                       <artifactId>logging-slf4j</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.ws.rs</groupId>
-                       <artifactId>javax.ws.rs-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.logging.log4j</groupId>
-                       <artifactId>log4j-slf4j-impl</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.glassfish.jersey.core</groupId>
-                       <artifactId>jersey-client</artifactId>
-                       <version>2.25.1</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.logging.log4j</groupId>
-                       <artifactId>log4j-core</artifactId>
-                       <version>2.10.0</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <scope>test</scope>
-       </dependency>
-       </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.logging-analytics</groupId>
+      <artifactId>logging-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-client</artifactId>
+      <version>2.25.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.10.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/reference/logging-filter/logging-filter-spring/pom.xml b/reference/logging-filter/logging-filter-spring/pom.xml
index c8be7a9..3f7c659 100644 (file)
--- a/reference/logging-filter/logging-filter-spring/pom.xml
+++ b/reference/logging-filter/logging-filter-spring/pom.xml
@@ -1,71 +1,71 @@
 <?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-filter-parent</artifactId>
-               <version>1.6.3-SNAPSHOT</version>
-       </parent>
+  <parent>
+    <groupId>org.onap.logging-analytics</groupId>
+    <artifactId>logging-filter-parent</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
+  </parent>
 
-       <artifactId>logging-filter-spring</artifactId>
+  <artifactId>logging-filter-spring</artifactId>
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.springframework.boot</groupId>
-                               <artifactId>spring-boot-dependencies</artifactId>
-                               <version>2.0.5.RELEASE</version>
-                               <type>pom</type>
-                               <scope>import</scope>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       <dependencies>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-webmvc</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.logging-analytics</groupId>
-                       <artifactId>logging-filter-base</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.logging-analytics</groupId>
-                       <artifactId>logging-slf4j</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.ws.rs</groupId>
-                       <artifactId>javax.ws.rs-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.logging.log4j</groupId>
-                       <artifactId>log4j-slf4j-impl</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.glassfish.jersey.core</groupId>
-                       <artifactId>jersey-client</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <scope>test</scope>
-       </dependency>
-       </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>2.0.5.RELEASE</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.logging-analytics</groupId>
+      <artifactId>logging-filter-base</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.logging-analytics</groupId>
+      <artifactId>logging-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/reference/logging-filter/pom.xml b/reference/logging-filter/pom.xml
index 8f7e5fb..a25c9a5 100644 (file)
--- 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>
diff --git a/reference/logging-kubernetes/pom.xml b/reference/logging-kubernetes/pom.xml
index 5ae96a4..764502e 100644 (file)
--- a/reference/logging-kubernetes/pom.xml
+++ b/reference/logging-kubernetes/pom.xml
@@ -1,12 +1,15 @@
-<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">
+<?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>
+
   <parent>
-      <groupId>org.onap.logging-analytics</groupId>
-      <artifactId>logging-reference</artifactId>
-      <version>1.6.3-SNAPSHOT</version>
+    <groupId>org.onap.logging-analytics</groupId>
+    <artifactId>logging-reference</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
   </parent>
+
   <artifactId>logging-kubernetes</artifactId>
   <packaging>pom</packaging>
+
   <name>logging-kubernetes</name>
 </project>
diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml
index cca06b6..306a934 100644 (file)
--- a/reference/logging-library/pom.xml
+++ b/reference/logging-library/pom.xml
@@ -1,144 +1,110 @@
+<?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>
+
   <parent>
-      <groupId>org.onap.logging-analytics</groupId>
-      <artifactId>logging-reference</artifactId>
-      <version>1.6.3-SNAPSHOT</version>
+    <groupId>org.onap.logging-analytics</groupId>
+    <artifactId>logging-reference</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
   </parent>
+
   <artifactId>logging-library</artifactId>
   <packaging>jar</packaging>
+
   <name>logging-library</name>
+
   <properties>
-      <spring.version>5.1.2.RELEASE</spring.version>
-      <logback.version>1.2.3</logback.version>
+    <spring.version>5.1.2.RELEASE</spring.version>
+    <logback.version>1.2.3</logback.version>
   </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.logging-analytics</groupId>
+      <artifactId>logging-slf4j</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <!-- decouple HttpServlet parameters from both this project and slf4j later -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-orm</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-oxm</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+      <!--scope>test</scope -->
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aspects</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
+      <version>1.9.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${spring.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback.version}</version>
+    </dependency>
+  </dependencies>
+
   <build>
-      <plugins>
+    <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
       </plugin>
     </plugins>
-      <pluginManagement>
-       <plugins>
-               <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-               <plugin>
-                       <groupId>org.eclipse.m2e</groupId>
-                       <artifactId>lifecycle-mapping</artifactId>
-                       <version>1.0.0</version>
-                       <configuration>
-                               <lifecycleMappingMetadata>
-                                       <pluginExecutions>
-                                               <pluginExecution>
-                                                       <pluginExecutionFilter>
-                                                               <groupId>
-                                                                       org.apache.maven.plugins
-                                                               </groupId>
-                                                               <artifactId>
-                                                                       maven-compiler-plugin
-                                                               </artifactId>
-                                                               <versionRange>
-                                                                       [3.2,)
-                                                               </versionRange>
-                                                               <goals>
-                                                                       <goal>testCompile</goal>
-                                                               </goals>
-                                                       </pluginExecutionFilter>
-                                                       <action>
-                                                               <ignore></ignore>
-                                                       </action>
-                                               </pluginExecution>
-                                       </pluginExecutions>
-                               </lifecycleMappingMetadata>
-                       </configuration>
-               </plugin>
-       </plugins>
-      </pluginManagement>
   </build>
-
-  <dependencies>
-       <dependency>
-           <groupId>org.onap.logging-analytics</groupId>
-           <artifactId>logging-slf4j</artifactId>
-           <version>${project.version}</version>
-       </dependency>
-       <!--  decouple HttpServlet parameters from both this project and slf4j later -->
-       <dependency>
-           <groupId>javax.servlet</groupId>
-           <artifactId>javax.servlet-api</artifactId>
-           <version>3.0.1</version>
-           <scope>provided</scope>
-       </dependency>
-       <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-oxm</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-            <!--scope>test</scope-->
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aspects</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>1.9.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
-         </dependency>
-         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-         </dependency>
-   </dependencies>
 </project>
diff --git a/reference/logging-mock-service/pom.xml b/reference/logging-mock-service/pom.xml
index 1da2c59..e31ff85 100644 (file)
--- a/reference/logging-mock-service/pom.xml
+++ b/reference/logging-mock-service/pom.xml
@@ -1,68 +1,35 @@
+<?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>
+
   <parent>
-      <groupId>org.onap.logging-analytics</groupId>
-      <artifactId>logging-reference</artifactId>
-      <version>1.6.3-SNAPSHOT</version>
+    <groupId>org.onap.logging-analytics</groupId>
+    <artifactId>logging-reference</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
   </parent>
+
   <artifactId>logging-mock-service</artifactId>
   <packaging>jar</packaging>
+
   <name>logging-mock-service</name>
+
+  <properties>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.logging-analytics</groupId>
+      <artifactId>logging-library</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
   <build>
-      <plugins>
+    <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
       </plugin>
     </plugins>
-      <pluginManagement>
-       <plugins>
-               <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-               <plugin>
-                       <groupId>org.eclipse.m2e</groupId>
-                       <artifactId>lifecycle-mapping</artifactId>
-                       <version>1.0.0</version>
-                       <configuration>
-                               <lifecycleMappingMetadata>
-                                       <pluginExecutions>
-                                               <pluginExecution>
-                                                       <pluginExecutionFilter>
-                                                               <groupId>
-                                                                       org.apache.maven.plugins
-                                                               </groupId>
-                                                               <artifactId>
-                                                                       maven-compiler-plugin
-                                                               </artifactId>
-                                                               <versionRange>
-                                                                       [3.2,)
-                                                               </versionRange>
-                                                               <goals>
-                                                                       <goal>testCompile</goal>
-                                                               </goals>
-                                                       </pluginExecutionFilter>
-                                                       <action>
-                                                               <ignore></ignore>
-                                                       </action>
-                                               </pluginExecution>
-                                       </pluginExecutions>
-                               </lifecycleMappingMetadata>
-                       </configuration>
-               </plugin>
-       </plugins>
-      </pluginManagement>
   </build>
-    <properties>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.logging-analytics</groupId>
-            <artifactId>logging-library</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
 </project>
diff --git a/reference/logging-slf4j-demo/pom.xml b/reference/logging-slf4j-demo/pom.xml
index e630e5b..1f73277 100644 (file)
--- a/reference/logging-slf4j-demo/pom.xml
+++ b/reference/logging-slf4j-demo/pom.xml
@@ -1,169 +1,163 @@
+<?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>
-    <parent>
-      <groupId>org.onap.logging-analytics</groupId>
-      <artifactId>logging-reference</artifactId>
-      <version>1.6.3-SNAPSHOT</version>
-      <relativePath>..</relativePath>
-    </parent>
-    <artifactId>logging-slf4j-demo</artifactId>
-    <name>logging-slf4j-demo</name>
-    <packaging>war</packaging>
-    <properties>
-        <!-- from 1.5.10 to not pull in spring 4.3.14/5.0.5 override of 5.0.9
-             however 4.3.17 of spring-core over 4.3.14 is not enough - need 4.3.18+
-             tomcat-embed-core 8.5.31 needs 8.5.32+ - which spring-boot 1.5.15 brings in
-             spring-expression 4.3.14 goes to 4.3.17 under 1.5.15
-             1.5.17 ups jackson-databind from 2.8.11.2 - but we will likely need 2.9+
-         -->
-        <springframework.boot.version>1.5.22.RELEASE</springframework.boot.version>
-        <spring.version>5.1.2.RELEASE</spring.version>
-        <logback.version>1.2.3</logback.version>
-    </properties>
+  <modelVersion>4.0.0</modelVersion>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>logging-slf4j</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-json</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-               </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.mashape.unirest</groupId>
-            <artifactId>unirest-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <parent>
+    <groupId>org.onap.logging-analytics</groupId>
+    <artifactId>logging-reference</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+  <artifactId>logging-slf4j-demo</artifactId>
+  <packaging>war</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${springframework.boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.tomcat.embed</groupId>
-                        <artifactId>tomcat-embed-websocket</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>3.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.25</version>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>${logback.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.mashape.unirest</groupId>
-                <artifactId>unirest-java</artifactId>
-                <version>1.4.9</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-codec</groupId>
-                        <artifactId>commons-codec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.testng</groupId>
-                <artifactId>testng</artifactId>
-                <version>6.8.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-all</artifactId>
-                <version>1.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-test</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <name>logging-slf4j-demo</name>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration/>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${springframework.boot.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <properties>
+    <!-- from 1.5.10 to not pull in spring 4.3.14/5.0.5 override of 5.0.9 however 4.3.17 of spring-core over 4.3.14 is not enough - need 4.3.18+ tomcat-embed-core 8.5.31 needs 8.5.32+ 
+      - which spring-boot 1.5.15 brings in spring-expression 4.3.14 goes to 4.3.17 under 1.5.15 1.5.17 ups jackson-databind from 2.8.11.2 - but we will likely need 2.9+ -->
+    <springframework.boot.version>1.5.22.RELEASE</springframework.boot.version>
+    <spring.version>5.1.2.RELEASE</spring.version>
+    <logback.version>1.2.3</logback.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${springframework.boot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-websocket</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>3.4</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.7.25</version>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>${logback.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.mashape.unirest</groupId>
+        <artifactId>unirest-java</artifactId>
+        <version>1.4.9</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.testng</groupId>
+        <artifactId>testng</artifactId>
+        <version>6.8.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-all</artifactId>
+        <version>1.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-test</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>logging-slf4j</artifactId>
+      <version>1.4.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-json</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.mashape.unirest</groupId>
+      <artifactId>unirest-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration />
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>${springframework.boot.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/reference/logging-slf4j/pom.xml b/reference/logging-slf4j/pom.xml
index 756c86e..85cbd54 100644 (file)
--- a/reference/logging-slf4j/pom.xml
+++ b/reference/logging-slf4j/pom.xml
@@ -1,92 +1,96 @@
+<?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>
-    <parent>
-      <groupId>org.onap.logging-analytics</groupId>
-      <artifactId>logging-reference</artifactId>
-      <version>1.6.3-SNAPSHOT</version>
-    </parent>
-    <artifactId>logging-slf4j</artifactId>
-    <name>logging-slf4j</name>
-    <packaging>jar</packaging>
-    <properties>
-        <spring.version>5.0.9.RELEASE</spring.version>
-        <logback.version>1.2.3</logback.version>
-    </properties>
-    <dependencies>
-        <!-- Exported dependencies. -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <!-- Provided dependencies. -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- Test dependencies. -->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <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-slf4j</artifactId>
+  <packaging>jar</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.25</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>3.1.0</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>${logback.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.testng</groupId>
-                <artifactId>testng</artifactId>
-                <version>6.8.5</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-all</artifactId>
-                <version>1.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-test</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <name>logging-slf4j</name>
 
+  <properties>
+    <spring.version>5.0.9.RELEASE</spring.version>
+    <logback.version>1.2.3</logback.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.7.25</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.1.0</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>${logback.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.testng</groupId>
+        <artifactId>testng</artifactId>
+        <version>6.8.5</version>
+        <exclusions>
+          <exclusion>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-all</artifactId>
+        <version>1.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-test</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <!-- Compile dependencies. -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <!-- Provided dependencies. -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Test dependencies. -->
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/reference/pom.xml b/reference/pom.xml
index b655e8a..50c572b 100644 (file)
--- a/reference/pom.xml
+++ b/reference/pom.xml
@@ -1,15 +1,18 @@
-<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">
+<?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>
+
   <parent>
-      <groupId>org.onap.logging-analytics</groupId>
-      <artifactId>logging-analytics</artifactId>
-      <version>1.6.3-SNAPSHOT</version>
+    <groupId>org.onap.logging-analytics</groupId>
+    <artifactId>logging-analytics</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
   </parent>
+
   <artifactId>logging-reference</artifactId>
   <packaging>pom</packaging>
+
   <name>logging-reference</name>
-  <url>http://maven.apache.org</url>
+
   <modules>
     <module>logging-demo</module>
     <module>logging-library</module>
@@ -19,111 +22,77 @@
     <module>logging-slf4j</module>
     <module>logging-slf4j-demo</module>
     <module>provider</module>
-       <module>logging-filter</module>
+    <module>logging-filter</module>
   </modules>
-  <build>
-      <pluginManagement>
-          <plugins>
-              <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-compiler-plugin</artifactId>
-                  <configuration>
-                      <source>1.8</source>
-                      <target>1.8</target>
-                  </configuration>
-              </plugin>
-              <plugin>
-                  <artifactId>maven-release-plugin</artifactId>
-                  <version>2.4.2</version>
-                  <dependencies>
-                      <dependency>
-                          <groupId>org.apache.maven.scm</groupId>
-                          <artifactId>maven-scm-provider-gitexe</artifactId>
-                          <version>1.8.1</version>
-                      </dependency>
-                  </dependencies>
-              </plugin>
 
-              <!-- Checkstyle plugin - used to report on compliance with -->
-              <!-- the Google style guide. -->
-              <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-site-plugin</artifactId>
-                  <version>3.6</version>
-              </plugin>
-               <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-               <plugin>
-                       <groupId>org.eclipse.m2e</groupId>
-                       <artifactId>lifecycle-mapping</artifactId>
-                       <version>1.0.0</version>
-                       <configuration>
-                               <lifecycleMappingMetadata>
-                                       <pluginExecutions>
-                                               <pluginExecution>
-                                                       <pluginExecutionFilter>
-                                                               <groupId>
-                                                                       org.apache.maven.plugins
-                                                               </groupId>
-                                                               <artifactId>
-                                                                       maven-compiler-plugin
-                                                               </artifactId>
-                                                               <versionRange>
-                                                                       [3.2,)
-                                                               </versionRange>
-                                                               <goals>
-                                                                       <goal>compile</goal>
-                                                               </goals>
-                                                       </pluginExecutionFilter>
-                                                       <action>
-                                                               <ignore></ignore>
-                                                       </action>
-                                               </pluginExecution>
-                                       </pluginExecutions>
-                               </lifecycleMappingMetadata>
-                       </configuration>
-               </plugin>
-       </plugins>
-      </pluginManagement>
-  </build>
   <properties>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-  <reporting>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.6.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement>
       <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-checkstyle-plugin</artifactId>
-              <version>2.17</version>
-              <reportSets>
-                  <reportSet>
-                      <reports>
-                          <report>checkstyle</report>
-                      </reports>
-                  </reportSet>
-              </reportSets>
-          </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.7.0</version>
+          <configuration>
+            <source>1.8</source>
+            <target>1.8</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.4.2</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-provider-gitexe</artifactId>
+              <version>1.8.1</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+
+        <!-- Checkstyle plugin - used to report on compliance with -->
+        <!-- the Google style guide. -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.6</version>
+        </plugin>
       </plugins>
-</reporting>
-    <dependencies>
-        <!--  pulls in banned logback-core 1.1.3 -->
-        <!-- dependency>
-            <groupId>com.att.eelf</groupId>
-            <artifactId>eelf-core</artifactId>
-            <version>1.0.0</version>
-        </dependency-->
-        <!-- JUnit 4.12 used to come with EELF -->
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
+    </pluginManagement>
+  </build>
 
-    </dependencies>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>checkstyle</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>
diff --git a/reference/provider/pom.xml b/reference/provider/pom.xml
index 3e517b7..487d5c1 100644 (file)
--- a/reference/provider/pom.xml
+++ b/reference/provider/pom.xml
@@ -1,12 +1,15 @@
-<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">
+<?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>
+
   <parent>
-      <groupId>org.onap.logging-analytics</groupId>
-      <artifactId>logging-reference</artifactId>
-      <version>1.6.3-SNAPSHOT</version>
+    <groupId>org.onap.logging-analytics</groupId>
+    <artifactId>logging-reference</artifactId>
+    <version>1.6.3-SNAPSHOT</version>
   </parent>
+
   <artifactId>logging-provider</artifactId>
   <packaging>pom</packaging>
+
   <name>logging-provider</name>
 </project>
ARCHIVED- 2022-02-15 at the request of the project