Merge branch 'master' into master

logging-modules/log-mdc/pom.xml

@@ -29,13 +29,13 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.library}</version>
+            <version>${jackson.version}</version>
         </dependency>
 
         <!--log4j dependencies -->
@@ -98,12 +98,9 @@
     </build>
 
     <properties>
-        <log4j.version>1.2.17</log4j.version>
         <log4j2.version>2.7</log4j2.version>
         <disruptor.version>3.3.6</disruptor.version>
         <jbosslogging.version>3.3.0.Final</jbosslogging.version>
-        <javax.servlet.version>3.1.0</javax.servlet.version>
-        <jackson.library>2.9.7</jackson.library>
         <maven-war-plugin.version>2.4</maven-war-plugin.version>
     </properties>
 

logging-modules/log4j2/pom.xml

@@ -115,8 +115,6 @@
     </profiles>
 
     <properties>
-        <jackson.version>2.9.7</jackson.version>
-        <h2.version>1.4.193</h2.version>
         <commons-dbcp2.version>2.1.1</commons-dbcp2.version>
         <log4j-core.version>2.11.0</log4j-core.version>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>

logging-modules/logback/pom.xml

@@ -58,7 +58,6 @@
     <properties>
         <logback.version>1.2.3</logback.version>
         <logback.contrib.version>0.1.5</logback.contrib.version>
-        <jackson.version>2.9.7</jackson.version>
         <docx4j.version>3.3.5</docx4j.version>
     </properties>