diff --git a/build.properties.sample b/build.properties.sample index 4cefa33..87067a5 100644 --- a/build.properties.sample +++ b/build.properties.sample @@ -10,4 +10,4 @@ oai-pmh.dcatde.contributorID=http://dcat-ap.de/def/contributors/gdiDE oai-pmh.csw.serviceShowMetadata.URL=https://localhost:8080/inspire/srv/eng/xml_iso19139?uuid=%uid% -oai-pmh.log.file=${catalina.base}/logs/open-nrw-ci-fassaden.log \ No newline at end of file +oai-pmh.log.file=${sys:catalina.base}/logs/open-nrw-ci-fassaden.log \ No newline at end of file diff --git a/pom.xml b/pom.xml index 17b0000..be76706 100644 --- a/pom.xml +++ b/pom.xml @@ -44,8 +44,19 @@ test - org.slf4j - slf4j-log4j12 + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + + + org.apache.logging.log4j + log4j-core + ${log4j.version} + + + org.apache.logging.log4j + log4j-api + ${log4j.version} org.apache.camel @@ -214,6 +225,7 @@ 3.14.0 2.6.1 + 2.17.1 UTF-8 diff --git a/src/main/java/eu/odp/harvest/geo/oai/xslt/HttpAwareUriResolver.java b/src/main/java/eu/odp/harvest/geo/oai/xslt/HttpAwareUriResolver.java index 9e70765..663a7f7 100644 --- a/src/main/java/eu/odp/harvest/geo/oai/xslt/HttpAwareUriResolver.java +++ b/src/main/java/eu/odp/harvest/geo/oai/xslt/HttpAwareUriResolver.java @@ -11,7 +11,8 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; @@ -24,7 +25,7 @@ */ public class HttpAwareUriResolver extends XsltUriResolver { - private final static Logger LOG = Logger.getLogger(HttpAwareUriResolver.class); + private final static Logger LOG = LogManager.getLogger(HttpAwareUriResolver.class); private static HttpClient httpClient = HttpClients.custom() .setConnectionManager(new PoolingHttpClientConnectionManager()).build(); diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml deleted file mode 100644 index 7dea1fa..0000000 --- a/src/main/resources/log4j.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml new file mode 100644 index 0000000..2c1ebe6 --- /dev/null +++ b/src/main/resources/log4j2.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file