ref #9359 adapt log4j handling in TaxEditor (cont.)

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 790446753e1509d1e1aa42375da3c83705cbff94..1d5a0f531c11b8d143b4fb8f654f2fd3279edf5a 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -259,6 +259,7 @@ Export-Package: com.sun.istack.internal.tools,
    org.apache.log4j.spi,
    org.w3c.dom,
    org.xml.sax",
+ org.apache.logging.log4j,
  org.apache.xerces.dom,
  org.hibernate,
  org.hibernate.annotations.common.reflection,
@@ -477,7 +478,8 @@ Bundle-ClassPath: .,
  lib/jdom2-2.0.6.jar,
  lib/joda-time-2.10.14.jar,
  lib/log4j-1.2.17.jar,
- lib/log4j-2.17.2.jar,
+ lib/log4j-api-2.17.2.jar,
+ lib/log4j-core-2.17.2.jar,
  lib/lsid-client-1.1.2.jar,
  lib/spring-aop-4.3.30.RELEASE.jar,
  lib/spring-aspects-4.3.30.RELEASE.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 4c327c98f4986e023d2f50c9f9102ba6e91dd0a4..5f42faf4b5d098abdb70752315a1e852cf6305f2 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -39,7 +39,8 @@ bin.includes = META-INF/,\
                lib/jdom-1.1.3.jar,\
                lib/joda-time-2.10.14.jar,\
                lib/log4j-1.2.17.jar,\
-               lib/log4j-2.17.2.jar,\
+               lib/log4j-api-2.17.2.jar,\
+                          lib/log4j-core-2.17.2.jar,\
                lib/lsid-client-1.1.2.jar,\
                lib/spring-aop-4.3.30.RELEASE.jar,\
                lib/spring-aspects-4.3.30.RELEASE.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index c3bc728c5cee4cd9a0e90387db74286236113193..bb7241106f78a4b5e792a540d39f0d6fb0a3ba8d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -66,7 +66,7 @@
                 httpclient,JavaAPIforKml,iiif-apis,commons-lang3,commons-lang,commons-text,\r
                 commons-codec,commons-collections,commons-io,commons-logging,ezmorph,\r
                 hibernate-search-engine,hibernate-search-orm,itextpdf,\r
-                json,json-lib,log4j,lucene-analyzers-common,lucene-core,lucene-queryparser,lucene-suggest,lucene-sandbox,\r
+                json,json-lib,log4j,log4j-core,log4j-api,lucene-analyzers-common,lucene-core,lucene-queryparser,lucene-suggest,lucene-sandbox,\r
                 xalan,\r
                 commons-imaging,jackson-databind,jackson-annotations,jackson-core,jboss-logging,\r
                 jakarta.validation-api,classmate,javax.el-api,slf4j-api,\r