Merge pull request #37 from epoh-r7/LOG-21519

LOG-21519 Upgrade dependencies and remove support for log4j

Author: epoh-r7

README.md

@@ -6,7 +6,6 @@ Logging To InsightOps from Java
 
 InsightOps currently supports logging from Java using the following logging libraries:
 
-* [Log4J](https://insightops.help.rapid7.com/docs/log4j-log4j2)
 * [Log4J2](https://insightops.help.rapid7.com/docs/log4j-log4j2)
 * [Logback](https://insightops.help.rapid7.com/docs/logback)
 * [Java Util Logging](https://insightops.help.rapid7.com/docs/java-util-logging)

configFiles/log4j.properties.example

@@ -4,12 +4,12 @@
     <properties>
         <additionalparam>-Xdoclint:none</additionalparam>
 
-        <jackson.version>2.12.1</jackson.version>
-        <log4j.version>2.17.1</log4j.version>
-        <junit.version>4.13.1</junit.version>
-        <mockito.version>1.9.5</mockito.version>
+        <jackson.version>2.15.0</jackson.version>
+        <log4j2.version>2.20.0</log4j2.version>
+        <junit.version>5.9.3</junit.version>
+        <mockito.version>4.11.0</mockito.version>
 
-        <disruptor.version>3.3.6</disruptor.version>
+        <disruptor.version>4.0.0.RC1</disruptor.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -18,8 +18,8 @@
     <artifactId>r7insight_java</artifactId>
     <packaging>jar</packaging>
     <name>r7insight_java</name>
-    <version>3.0.16-SNAPSHOT</version>
-    <description>Contains logback, log4j, and log4j2 appenders that will send log data to Logentries</description>
+    <version>4.0.0-SNAPSHOT</version>
+    <description>Contains logback and log4j2 appenders that will send log data to Logentries</description>
     <url>https://github.com/rapid7/r7insight_java</url>
 
     <licenses>
@@ -60,7 +60,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -70,7 +70,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
+                <version>3.1.0</version>
                 <configuration>
                     <systemPropertyVariables>
                         <!--to Test tls/ssl mode connections in unit tests-->
@@ -110,7 +110,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.1.1</version>
+                        <version>3.5.0</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -123,15 +123,15 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-release-plugin</artifactId>
-                        <version>2.5</version>
+                        <version>3.0.0</version>
                         <configuration>
                             <tagNameFormat>@{project.version}</tagNameFormat>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -160,12 +160,6 @@
     </profiles>
 
     <dependencies>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>com.lmax</groupId>
             <artifactId>disruptor</artifactId>
@@ -175,13 +169,13 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${log4j.version}</version>
+            <version>${log4j2.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>${log4j.version}</version>
+            <version>${log4j2.version}</version>
             <optional>true</optional>
         </dependency>
         <!-- Jackson 2 start -->
@@ -224,14 +218,14 @@
         </dependency>
         <!-- TEST -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>

configFiles/log4j.xml.example

@@ -2,8 +2,8 @@
 
 
 import com.rapid7.util.SocketChannelReceiver;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
@@ -12,7 +12,7 @@
 
 public class LogentriesHandlerTest {
 
-    @After
+    @AfterEach
     public void cleanUpConfiguration() {
         LogManager.getLogManager().reset();
     }