From 2e66dc9fc3ac0510c1b65c21268a002fd730ba2d Mon Sep 17 00:00:00 2001 From: Anne Ferger Date: Tue, 16 Aug 2022 09:42:40 +0200 Subject: [PATCH] newer log4j version --- pom.xml | 10 ++-------- src/main/java/de/edirom/meigarage/MEIValidator.java | 5 +++-- .../de/edirom/meigarage/XmlValidatorsProvider.java | 5 +++-- .../java/de/edirom/meigarage/xml/RNGValidator.java | 5 +++-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 8e25b38..065b3cd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.edirom.meigarage mei-validator - 0.3.0 + 0.3.1 MEI Validator @@ -109,16 +109,10 @@ 4.13.2 test - - pl.psnc.dl.ege - ege-api - 0.4.0 - compile - pl.psnc.dl.ege ege-framework - 0.5 + 0.5.1 compile diff --git a/src/main/java/de/edirom/meigarage/MEIValidator.java b/src/main/java/de/edirom/meigarage/MEIValidator.java index 6ad9310..45ff387 100644 --- a/src/main/java/de/edirom/meigarage/MEIValidator.java +++ b/src/main/java/de/edirom/meigarage/MEIValidator.java @@ -1,7 +1,8 @@ package de.edirom.meigarage; import de.edirom.meigarage.xml.XmlValidator; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.jdom2.JDOMException; import org.xml.sax.SAXParseException; import pl.psnc.dl.ege.component.Validator; @@ -25,7 +26,7 @@ */ public class MEIValidator implements Validator { - private static final Logger LOGGER = Logger.getLogger(MEIValidator.class); + private static final Logger LOGGER = LogManager.getLogger(MEIValidator.class); private static final XmlValidatorsProvider provider = XmlValidatorsProvider .getInstance(); diff --git a/src/main/java/de/edirom/meigarage/XmlValidatorsProvider.java b/src/main/java/de/edirom/meigarage/XmlValidatorsProvider.java index e18ed63..561a51c 100644 --- a/src/main/java/de/edirom/meigarage/XmlValidatorsProvider.java +++ b/src/main/java/de/edirom/meigarage/XmlValidatorsProvider.java @@ -2,7 +2,8 @@ import de.edirom.meigarage.xml.RNGValidator; import de.edirom.meigarage.xml.XmlValidator; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -25,7 +26,7 @@ */ public class XmlValidatorsProvider extends DefaultHandler { - private static final Logger logger = Logger + private static final Logger logger = LogManager .getLogger(XmlValidatorsProvider.class); public static final String T_VALIDATOR = "validator"; diff --git a/src/main/java/de/edirom/meigarage/xml/RNGValidator.java b/src/main/java/de/edirom/meigarage/xml/RNGValidator.java index 3685eb8..827ce49 100644 --- a/src/main/java/de/edirom/meigarage/xml/RNGValidator.java +++ b/src/main/java/de/edirom/meigarage/xml/RNGValidator.java @@ -1,6 +1,7 @@ package de.edirom.meigarage.xml; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -17,7 +18,7 @@ public class RNGValidator implements XmlValidator { - private static final Logger LOGGER = Logger.getLogger(RNGValidator.class); + private static final Logger LOGGER = LogManager.getLogger(RNGValidator.class); private final String schemeUrl;