diff --git a/apps/sparkpost-documentor-app/log4j.properties b/apps/sparkpost-documentor-app/log4j.properties index 6a7f937..2476343 100644 --- a/apps/sparkpost-documentor-app/log4j.properties +++ b/apps/sparkpost-documentor-app/log4j.properties @@ -1,10 +1,10 @@ # Root logger option -log4j.rootLogger=DEBUG, stdout +log4j.rootLogger=DEBUG, STDOUT # Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout=org.apache.logging.log4j.ConsoleAppender +log4j.appender.stdout.Target=SYSTEM_OUT +log4j.appender.stdout.layout=org.apache.logging.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n diff --git a/apps/sparkpost-documentor-app/pom.xml b/apps/sparkpost-documentor-app/pom.xml index e00d784..b55b52e 100644 --- a/apps/sparkpost-documentor-app/pom.xml +++ b/apps/sparkpost-documentor-app/pom.xml @@ -17,9 +17,13 @@ - log4j - log4j + org.apache.logging.log4j + log4j-1.2-api + + org.apache.logging.log4j + log4j-core + com.google.code.gson gson diff --git a/apps/sparkpost-javamail-app/log4j.xml b/apps/sparkpost-javamail-app/log4j.xml index fef6cfb..7fccf5a 100644 --- a/apps/sparkpost-javamail-app/log4j.xml +++ b/apps/sparkpost-javamail-app/log4j.xml @@ -1,17 +1,14 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/apps/sparkpost-javamail-app/src/main/java/com/sparkpost/sample/App.java b/apps/sparkpost-javamail-app/src/main/java/com/sparkpost/sample/App.java index ee9eb3f..6d0a42a 100644 --- a/apps/sparkpost-javamail-app/src/main/java/com/sparkpost/sample/App.java +++ b/apps/sparkpost-javamail-app/src/main/java/com/sparkpost/sample/App.java @@ -20,8 +20,8 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; +import org.apache.logging.log4j.Level; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -41,8 +41,8 @@ public class App extends SparkPostBaseApp { public static void main(String[] args) throws Exception { - Logger.getRootLogger().setLevel(Level.DEBUG); - + Configurator.setRootLevel(Level.DEBUG); + App app = new App(); app.runApp(); } diff --git a/apps/sparkpost-samples-app/log4j.properties b/apps/sparkpost-samples-app/log4j.properties index 6a7f937..2476343 100644 --- a/apps/sparkpost-samples-app/log4j.properties +++ b/apps/sparkpost-samples-app/log4j.properties @@ -1,10 +1,10 @@ # Root logger option -log4j.rootLogger=DEBUG, stdout +log4j.rootLogger=DEBUG, STDOUT # Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout=org.apache.logging.log4j.ConsoleAppender +log4j.appender.stdout.Target=SYSTEM_OUT +log4j.appender.stdout.layout=org.apache.logging.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n diff --git a/apps/sparkpost-samples-app/pom.xml b/apps/sparkpost-samples-app/pom.xml index 74ba9a2..2dac4a7 100644 --- a/apps/sparkpost-samples-app/pom.xml +++ b/apps/sparkpost-samples-app/pom.xml @@ -16,11 +16,14 @@ com.sparkpost sparkpost-lib - - log4j - log4j + org.apache.logging.log4j + log4j-1.2-api + + org.apache.logging.log4j + log4j-core + com.google.code.gson gson diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/BadApiKeyErrorSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/BadApiKeyErrorSample.java index 98fe9ee..db11040 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/BadApiKeyErrorSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/BadApiKeyErrorSample.java @@ -3,8 +3,10 @@ import java.io.IOException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostAccessForbiddenException; @@ -19,12 +21,12 @@ */ public class BadApiKeyErrorSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(BadApiKeyErrorSample.class); + static final Logger logger = LogManager.getLogger(BadApiKeyErrorSample.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); BadApiKeyErrorSample sample = new BadApiKeyErrorSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/ForceTransportError.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/ForceTransportError.java index 7d6a5a9..3a57353 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/ForceTransportError.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/ForceTransportError.java @@ -3,8 +3,10 @@ import java.io.IOException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostErrorServerResponseException; @@ -17,12 +19,12 @@ public class ForceTransportError extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(ForceTransportError.class); + static final Logger logger = LogManager.getLogger(ForceTransportError.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); ForceTransportError app = new ForceTransportError(); app.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendEmailErrorSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendEmailErrorSample.java index 7cc4e8e..8020179 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendEmailErrorSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendEmailErrorSample.java @@ -7,8 +7,10 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostErrorServerResponseException; @@ -25,12 +27,12 @@ public class SendEmailErrorSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(SendEmailErrorSample.class); + static final Logger logger = LogManager.getLogger(SendEmailErrorSample.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); SendEmailErrorSample sample = new SendEmailErrorSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendInvalidFromAddress.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendInvalidFromAddress.java index a275331..e2542bb 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendInvalidFromAddress.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/SendInvalidFromAddress.java @@ -7,8 +7,10 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostErrorServerResponseException; @@ -25,12 +27,12 @@ public class SendInvalidFromAddress extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(SendInvalidFromAddress.class); + static final Logger logger = LogManager.getLogger(SendInvalidFromAddress.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); SendInvalidFromAddress sample = new SendInvalidFromAddress(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateRecipientListSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateRecipientListSample.java index b71823e..c54d15c 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateRecipientListSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateRecipientListSample.java @@ -5,8 +5,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -33,12 +35,12 @@ */ public class CreateRecipientListSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); CreateRecipientListSample app = new CreateRecipientListSample(); app.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile.java index 479736b..f298b9b 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile.java @@ -3,8 +3,9 @@ import java.io.IOException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -15,6 +16,7 @@ import com.sparkpost.sdk.samples.helpers.SparkPostBaseApp; import com.sparkpost.transport.IRestConnection; import com.sparkpost.transport.RestConnection; +import org.apache.logging.log4j.core.config.Configurator; /** * This class demonstrates how to store and RFC822 template in SparkPost @@ -22,12 +24,12 @@ */ public class CreateTemplateFromFile extends SparkPostBaseApp { - private static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + private static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); CreateTemplateFromFile sample = new CreateTemplateFromFile(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile2.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile2.java index ba691d5..76b07db 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile2.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateFromFile2.java @@ -3,8 +3,10 @@ import java.io.IOException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -22,12 +24,12 @@ */ public class CreateTemplateFromFile2 extends SparkPostBaseApp { - private static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + private static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); CreateTemplateFromFile2 sample = new CreateTemplateFromFile2(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateSimple.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateSimple.java index 7a7afd4..6fa1915 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateSimple.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/CreateTemplateSimple.java @@ -3,8 +3,10 @@ import java.io.IOException; import java.util.List; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -19,12 +21,12 @@ public class CreateTemplateSimple extends SparkPostBaseApp { - private static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + private static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); CreateTemplateSimple sample = new CreateTemplateSimple(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteSampleTemplates.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteSampleTemplates.java index 95db205..edc773c 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteSampleTemplates.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteSampleTemplates.java @@ -4,8 +4,9 @@ import java.io.IOException; import java.util.List; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -16,18 +17,19 @@ import com.sparkpost.sdk.samples.helpers.SparkPostBaseApp; import com.sparkpost.transport.IRestConnection; import com.sparkpost.transport.RestConnection; +import org.apache.logging.log4j.core.config.Configurator; /** * Delete all test templates created by the sample code */ public class DeleteSampleTemplates extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(DeleteSampleTemplates.class); + static final Logger logger = LogManager.getLogger(DeleteSampleTemplates.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); DeleteSampleTemplates sample = new DeleteSampleTemplates(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteWebhookSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteWebhookSample.java index 49c622d..0f0feea 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteWebhookSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeleteWebhookSample.java @@ -3,8 +3,9 @@ import java.io.IOException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -14,18 +15,19 @@ import com.sparkpost.sdk.samples.helpers.SparkPostBaseApp; import com.sparkpost.transport.IRestConnection; import com.sparkpost.transport.RestConnection; +import org.apache.logging.log4j.core.config.Configurator; /** * Delete all webhooks with "deleteme" in their name */ public class DeleteWebhookSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); DeleteWebhookSample sample = new DeleteWebhookSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeliverabilityMetricsSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeliverabilityMetricsSample.java index bb9a6c9..95b36f5 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeliverabilityMetricsSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/DeliverabilityMetricsSample.java @@ -5,8 +5,10 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -33,10 +35,10 @@ public class DeliverabilityMetricsSample extends SparkPostBaseApp { private static final String FROM_DATE = "2014-07-11T08:00"; - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); if (args.length == 0) { System.err.println("You must pass the metrics you want to querying"); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllSendingDomains.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllSendingDomains.java index 6168f19..2ccc7ef 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllSendingDomains.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllSendingDomains.java @@ -3,8 +3,10 @@ import java.io.IOException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -19,12 +21,12 @@ */ public class ListAllSendingDomains extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); ListAllSendingDomains sample = new ListAllSendingDomains(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTemplatesSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTemplatesSample.java index df7c060..4d4156f 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTemplatesSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTemplatesSample.java @@ -4,8 +4,10 @@ import java.io.IOException; import java.util.List; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -21,12 +23,12 @@ */ public class ListAllTemplatesSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); ListAllTemplatesSample sample = new ListAllTemplatesSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTransmissionsSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTransmissionsSample.java index ee4ff51..1991003 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTransmissionsSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllTransmissionsSample.java @@ -3,8 +3,7 @@ import java.io.IOException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -15,6 +14,7 @@ import com.sparkpost.sdk.samples.helpers.SparkPostBaseApp; import com.sparkpost.transport.IRestConnection; import com.sparkpost.transport.RestConnection; +import org.apache.logging.log4j.core.config.Configurator; /** * List an array of transmission summary objects. A transmission summary object @@ -40,7 +40,7 @@ public class ListAllTransmissionsSample extends SparkPostBaseApp { private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); ListAllTransmissionsSample sample = new ListAllTransmissionsSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllWebhooksSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllWebhooksSample.java index d599bcc..3e9865d 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllWebhooksSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/ListAllWebhooksSample.java @@ -3,8 +3,10 @@ import java.io.IOException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -19,12 +21,12 @@ */ public class ListAllWebhooksSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); ListAllWebhooksSample sample = new ListAllWebhooksSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MandrillBlacklistImport.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MandrillBlacklistImport.java index 0bb0c45..558fa1c 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MandrillBlacklistImport.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MandrillBlacklistImport.java @@ -8,8 +8,10 @@ import java.util.ArrayList; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -26,7 +28,7 @@ */ public class MandrillBlacklistImport extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(MandrillBlacklistImport.class); + static final Logger logger = LogManager.getLogger(MandrillBlacklistImport.class); private Client client; @@ -44,7 +46,7 @@ public static class Fields { } public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); MandrillBlacklistImport sample = new MandrillBlacklistImport(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MessageEventSearchSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MessageEventSearchSample.java index 2b5099a..9827fdc 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MessageEventSearchSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/MessageEventSearchSample.java @@ -5,8 +5,10 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostErrorServerResponseException; @@ -24,10 +26,10 @@ */ public class MessageEventSearchSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); public static void main(String[] args) throws SparkPostException, IOException, InterruptedException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); MessageEventSearchSample app = new MessageEventSearchSample(); app.doSearch(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/PreviewTemplateSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/PreviewTemplateSample.java index cda3111..c1715d7 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/PreviewTemplateSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/PreviewTemplateSample.java @@ -8,8 +8,10 @@ import java.net.URI; import java.net.URISyntaxException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -29,12 +31,12 @@ */ public class PreviewTemplateSample extends SparkPostBaseApp { - private static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + private static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); PreviewTemplateSample sample = new PreviewTemplateSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/RetrieveAllTemplatesSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/RetrieveAllTemplatesSample.java index 16335a7..ff0be26 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/RetrieveAllTemplatesSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/RetrieveAllTemplatesSample.java @@ -4,8 +4,10 @@ import java.io.IOException; import java.util.List; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -22,12 +24,12 @@ */ public class RetrieveAllTemplatesSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); RetrieveAllTemplatesSample sample = new RetrieveAllTemplatesSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SampleApplication.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SampleApplication.java index 99ebd19..9ee91d4 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SampleApplication.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SampleApplication.java @@ -5,8 +5,8 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -35,7 +35,7 @@ public class SampleApplication { public static void main(String[] args) throws SparkPostException { // Set to DEBUG so we can see what the SparkPost SDK is doing: - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); // Initialize our JSON parser. We'll use it to parse responses from // the SparkPost server. diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendAmpEmailSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendAmpEmailSample.java index e184dc1..90bdae6 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendAmpEmailSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendAmpEmailSample.java @@ -7,8 +7,10 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -24,12 +26,12 @@ public class SendAmpEmailSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); SendAmpEmailSample sample = new SendAmpEmailSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailBCCSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailBCCSample.java index 1c8a6ad..cdbd552 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailBCCSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailBCCSample.java @@ -5,8 +5,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -22,12 +24,12 @@ public class SendEmailBCCSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); SendEmailBCCSample sample = new SendEmailBCCSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailCCSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailCCSample.java index 0d9283e..9f17558 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailCCSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailCCSample.java @@ -7,8 +7,10 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -24,12 +26,12 @@ public class SendEmailCCSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); SendEmailCCSample sample = new SendEmailCCSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailRecipientListSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailRecipientListSample.java index 48e8c20..182c165 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailRecipientListSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailRecipientListSample.java @@ -5,8 +5,10 @@ import java.util.HashMap; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -22,12 +24,12 @@ public class SendEmailRecipientListSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); SendEmailRecipientListSample sample = new SendEmailRecipientListSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailSample.java index 9735954..77dcd77 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailSample.java @@ -7,8 +7,10 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -24,12 +26,12 @@ public class SendEmailSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); SendEmailSample sample = new SendEmailSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailTemplateSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailTemplateSample.java index d6398c3..c7a7967 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailTemplateSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailTemplateSample.java @@ -7,8 +7,10 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -24,12 +26,12 @@ public class SendEmailTemplateSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); SendEmailTemplateSample sample = new SendEmailTemplateSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithFilesSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithFilesSample.java index f796e6b..05faaae 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithFilesSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithFilesSample.java @@ -5,8 +5,10 @@ import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -24,12 +26,12 @@ public class SendEmailWithFilesSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); SendEmailWithFilesSample sample = new SendEmailWithFilesSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithSubstitutionSample.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithSubstitutionSample.java index 844b761..e26b747 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithSubstitutionSample.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/samples/SendEmailWithSubstitutionSample.java @@ -7,8 +7,10 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; @@ -24,12 +26,12 @@ public class SendEmailWithSubstitutionSample extends SparkPostBaseApp { - static final Logger logger = Logger.getLogger(SendEmailWithSubstitutionSample.class); + static final Logger logger = LogManager.getLogger(SendEmailWithSubstitutionSample.class); private Client client; public static void main(String[] args) throws SparkPostException, IOException { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); SendEmailWithSubstitutionSample sample = new SendEmailWithSubstitutionSample(); sample.runApp(); diff --git a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/sdk/samples/helpers/SparkPostBaseApp.java b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/sdk/samples/helpers/SparkPostBaseApp.java index 6d6d7d3..c240e1a 100644 --- a/apps/sparkpost-samples-app/src/main/java/com/sparkpost/sdk/samples/helpers/SparkPostBaseApp.java +++ b/apps/sparkpost-samples-app/src/main/java/com/sparkpost/sdk/samples/helpers/SparkPostBaseApp.java @@ -11,9 +11,10 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.Logger; - +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.config.Configurator; +import org.apache.logging.log4j.core.config.DefaultConfiguration; import com.sparkpost.Client; import com.sparkpost.exception.SparkPostException; import com.sparkpost.samples.CreateTemplateSimple; @@ -29,11 +30,11 @@ public class SparkPostBaseApp { private final Properties properties = new Properties(); - static final Logger logger = Logger.getLogger(CreateTemplateSimple.class); + static final Logger logger = LogManager.getLogger(CreateTemplateSimple.class); public SparkPostBaseApp() { super(); - BasicConfigurator.configure(); + Configurator.initialize(new DefaultConfiguration()); this.loadProperties(); } diff --git a/libs/sparkpost-lib/pom.xml b/libs/sparkpost-lib/pom.xml index e662047..85e2d91 100644 --- a/libs/sparkpost-lib/pom.xml +++ b/libs/sparkpost-lib/pom.xml @@ -13,10 +13,13 @@ - log4j - log4j + org.apache.logging.log4j + log4j-1.2-api - + + org.apache.logging.log4j + log4j-core + com.google.code.gson gson diff --git a/libs/sparkpost-lib/src/main/java/com/sparkpost/transport/RestConnection.java b/libs/sparkpost-lib/src/main/java/com/sparkpost/transport/RestConnection.java index 18ff59f..9b2be69 100644 --- a/libs/sparkpost-lib/src/main/java/com/sparkpost/transport/RestConnection.java +++ b/libs/sparkpost-lib/src/main/java/com/sparkpost/transport/RestConnection.java @@ -17,7 +17,8 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.sparkpost.Build; import com.sparkpost.Client; @@ -37,7 +38,7 @@ */ public class RestConnection implements IRestConnection { - private static final Logger logger = Logger.getLogger(RestConnection.class); + private static final Logger logger = LogManager.getLogger(RestConnection.class); private static final String VERSION = Build.VERSION + " (" + Build.GIT_SHORT_HASH + ")"; diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/EndPointTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/EndPointTest.java index e1c14e5..abe0c06 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/EndPointTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/EndPointTest.java @@ -1,8 +1,8 @@ package com.sparkpost; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -19,7 +19,7 @@ public EndPointTest() { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/AddressAttributesTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/AddressAttributesTests.java index 2b42d44..51dfa73 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/AddressAttributesTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/AddressAttributesTests.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -24,7 +24,7 @@ public class AddressAttributesTests { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMResultsTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMResultsTest.java index 5b5f135..45a3701 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMResultsTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMResultsTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -33,7 +33,7 @@ public class DKIMResultsTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMTest.java index 5152201..63e4cff 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DKIMTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -23,7 +23,7 @@ public class DKIMTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DNSAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DNSAttributesTest.java index 38da994..3ce2823 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DNSAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/DNSAttributesTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -23,7 +23,7 @@ public class DNSAttributesTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/MessageEventsQueryBuilderTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/MessageEventsQueryBuilderTest.java index 7911e2b..266d1bc 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/MessageEventsQueryBuilderTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/MessageEventsQueryBuilderTest.java @@ -3,8 +3,8 @@ import java.net.URISyntaxException; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -19,7 +19,7 @@ public class MessageEventsQueryBuilderTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/OptionsAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/OptionsAttributesTest.java index 4ca574f..d60fbae 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/OptionsAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/OptionsAttributesTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -26,7 +26,7 @@ public class OptionsAttributesTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientAttributesTest.java index 2967d2c..51eea27 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientAttributesTest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.After; @@ -45,7 +45,7 @@ public class RecipientAttributesTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientListTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientListTest.java index 91f6586..d05a134 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientListTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/RecipientListTest.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -82,7 +82,7 @@ public class RecipientListTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SendingDomainTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SendingDomainTest.java index 7edfc41..47ce10c 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SendingDomainTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SendingDomainTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -18,7 +18,7 @@ public class SendingDomainTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StatusAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StatusAttributesTest.java index e9c5d8b..768f8d9 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StatusAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StatusAttributesTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -25,7 +25,7 @@ public class StatusAttributesTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredRecipientListTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredRecipientListTest.java index 648447c..395a65f 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredRecipientListTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredRecipientListTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -18,7 +18,7 @@ public class StoredRecipientListTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredTemplateTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredTemplateTest.java index b3abc37..1b5be1c 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredTemplateTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/StoredTemplateTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -21,7 +21,7 @@ public class StoredTemplateTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListEntryTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListEntryTest.java index 2885a0a..214c0f6 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListEntryTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListEntryTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -23,7 +23,7 @@ public class SuppressionListEntryTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListTest.java index bb2925d..81b80ee 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/SuppressionListTest.java @@ -3,8 +3,8 @@ import java.util.List; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -32,7 +32,7 @@ public class SuppressionListTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateAttributesTest.java index 08e33e2..67bf5b3 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateAttributesTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -45,7 +45,7 @@ public class TemplateAttributesTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateContentAttributesTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateContentAttributesTest.java index e98f694..efb614a 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateContentAttributesTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TemplateContentAttributesTest.java @@ -3,8 +3,8 @@ import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -33,7 +33,7 @@ public class TemplateContentAttributesTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TransmissionWithRecipientArrayTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TransmissionWithRecipientArrayTest.java index a460216..73dd4f8 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TransmissionWithRecipientArrayTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/TransmissionWithRecipientArrayTest.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -72,7 +72,7 @@ public class TransmissionWithRecipientArrayTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/VerifyResponseTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/VerifyResponseTest.java index 05758d1..3929331 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/VerifyResponseTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/VerifyResponseTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -34,7 +34,7 @@ public class VerifyResponseTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/BounceEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/BounceEventTest.java index 307dacf..f320ec8 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/BounceEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/BounceEventTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -48,7 +48,7 @@ public class BounceEventTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/ClickEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/ClickEventTest.java index b0739cc..3b90b02 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/ClickEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/ClickEventTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -37,7 +37,7 @@ public class ClickEventTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DelayEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DelayEventTest.java index e71a777..31553ea 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DelayEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DelayEventTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -46,7 +46,7 @@ public class DelayEventTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DeliveryEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DeliveryEventTest.java index e8f64cc..dda4e54 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DeliveryEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/DeliveryEventTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -39,7 +39,7 @@ public class DeliveryEventTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationFailureEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationFailureEventTest.java index 3636430..6a19cb0 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationFailureEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationFailureEventTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -41,7 +41,7 @@ public class GenerationFailureEventTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationRejectionEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationRejectionEventTest.java index 79ff80a..61fe885 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationRejectionEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/GenerationRejectionEventTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -38,7 +38,7 @@ public class GenerationRejectionEventTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/InjectionEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/InjectionEventTest.java index 959db4a..e66e189 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/InjectionEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/InjectionEventTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -39,7 +39,7 @@ public class InjectionEventTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/OpenEventTest.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/OpenEventTest.java index a94fe35..f6f2bdf 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/OpenEventTest.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/model/webhook/event/OpenEventTest.java @@ -1,8 +1,8 @@ package com.sparkpost.model.webhook.event; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -46,7 +46,7 @@ public class OpenEventTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceMetricTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceMetricTests.java index 823fa9c..b8bd153 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceMetricTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceMetricTests.java @@ -3,8 +3,8 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -21,7 +21,7 @@ public class ResourceMetricTests extends BaseResourceTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceRecipientListsTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceRecipientListsTests.java index 928fa20..c443ccf 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceRecipientListsTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceRecipientListsTests.java @@ -3,8 +3,8 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -23,7 +23,7 @@ public class ResourceRecipientListsTests extends BaseResourceTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSendingDomainsTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSendingDomainsTests.java index 4893a96..158be9e 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSendingDomainsTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSendingDomainsTests.java @@ -3,8 +3,8 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -22,7 +22,7 @@ public class ResourceSendingDomainsTests extends BaseResourceTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSuppressionListTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSuppressionListTests.java index e4b9738..165c29f 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSuppressionListTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceSuppressionListTests.java @@ -3,8 +3,8 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -22,7 +22,7 @@ public class ResourceSuppressionListTests extends BaseResourceTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTemplatesTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTemplatesTests.java index 3f21b29..af62c1a 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTemplatesTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTemplatesTests.java @@ -3,8 +3,8 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -26,7 +26,7 @@ public class ResourceTemplatesTests extends BaseResourceTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTransmissionsTests.java b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTransmissionsTests.java index a9c177b..98e49d2 100644 --- a/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTransmissionsTests.java +++ b/libs/sparkpost-lib/src/test/java/com/sparkpost/resources/ResourceTransmissionsTests.java @@ -3,8 +3,8 @@ import java.lang.reflect.Type; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.core.config.Configurator; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -25,7 +25,7 @@ public class ResourceTransmissionsTests extends BaseResourceTest { @BeforeClass public static void setUpClass() { - Logger.getRootLogger().setLevel(Level.DEBUG); + Configurator.setRootLevel(Level.DEBUG); } @AfterClass diff --git a/pom.xml b/pom.xml index fef0c09..e4855b3 100644 --- a/pom.xml +++ b/pom.xml @@ -216,11 +216,16 @@ - - log4j - log4j - 1.2.17 - + + org.apache.logging.log4j + log4j-1.2-api + 2.14.1 + + + org.apache.logging.log4j + log4j-core + 2.14.1 + org.slf4j slf4j-api