From cbb2dab5e9a340b1483dda05d113380157f86c3a Mon Sep 17 00:00:00 2001 From: Dirk Stenger Date: Thu, 6 Jun 2024 18:26:38 +0200 Subject: [PATCH 1/5] Create new module deegree-core-test-logging, add test-logging dependencies and remove log4j2.properties in test modules --- .../pom.xml | 6 + deegree-core/deegree-core-base/pom.xml | 6 + deegree-core/deegree-core-commons/pom.xml | 6 + deegree-core/deegree-core-coverage/pom.xml | 6 + deegree-core/deegree-core-cs/pom.xml | 6 + .../src/test/resources/log4j.properties | 137 ------------------ deegree-core/deegree-core-featureinfo/pom.xml | 6 + deegree-core/deegree-core-geometry/pom.xml | 6 + deegree-core/deegree-core-layer/pom.xml | 6 + deegree-core/deegree-core-metadata/pom.xml | 6 + .../deegree-protocol-commons/pom.xml | 6 + .../deegree-protocol-csw/pom.xml | 6 + .../deegree-protocol-wfs/pom.xml | 6 + .../deegree-protocol-wms/pom.xml | 6 + .../deegree-protocol-wmts/pom.xml | 8 +- .../deegree-remoteows-wmts/pom.xml | 6 + .../deegree-core-rendering-2d/pom.xml | 6 + .../deegree-sqldialect-mssql/pom.xml | 6 + .../deegree-sqldialect-oracle/pom.xml | 6 + deegree-core/deegree-core-style/pom.xml | 6 + .../deegree-core-test-logging/pom.xml | 25 ++++ .../src/main/resources/log4j2.properties | 13 ++ deegree-core/deegree-core-tile/pom.xml | 6 + deegree-core/pom.xml | 1 + .../deegree-featurestore-memory/pom.xml | 6 + .../deegree-featurestore-sql/pom.xml | 6 + .../deegree-mdstore-ebrim-eo/pom.xml | 6 + .../deegree-mdstore-iso-memory/pom.xml | 6 + .../deegree-mdstore-iso/pom.xml | 6 + .../deegree-tilestore-filesystem/pom.xml | 6 + deegree-layers/deegree-layers-feature/pom.xml | 6 + .../deegree-services-commons/pom.xml | 6 + deegree-services/deegree-services-wfs/pom.xml | 6 + deegree-services/deegree-services-wms/pom.xml | 8 +- .../deegree-compliance-tests/pom.xml | 10 +- .../src/test/resources/log4j2.properties | 40 ----- .../deegree-integration-tests/pom.xml | 6 +- .../src/test/resources/log4j2.properties | 40 ----- .../deegree-wms-remoteows-tests/pom.xml | 6 +- .../src/test/resources/log4j2.properties | 20 --- .../deegree-wms-similarity-tests/pom.xml | 10 +- .../src/test/resources/log4j2.properties | 37 ----- deegree-tests/deegree-wmts-tests/pom.xml | 10 +- .../src/test/resources/log4j2.properties | 45 ------ deegree-tests/deegree-workspace-tests/pom.xml | 10 +- .../src/test/resources/log4j2.properties | 20 --- pom.xml | 16 -- 47 files changed, 253 insertions(+), 377 deletions(-) delete mode 100644 deegree-core/deegree-core-cs/src/test/resources/log4j.properties create mode 100644 deegree-core/deegree-core-test-logging/pom.xml create mode 100644 deegree-core/deegree-core-test-logging/src/main/resources/log4j2.properties delete mode 100644 deegree-tests/deegree-compliance-tests/src/test/resources/log4j2.properties delete mode 100644 deegree-tests/deegree-integration-tests/src/test/resources/log4j2.properties delete mode 100644 deegree-tests/deegree-wms-remoteows-tests/src/test/resources/log4j2.properties delete mode 100644 deegree-tests/deegree-wms-similarity-tests/src/test/resources/log4j2.properties delete mode 100644 deegree-tests/deegree-wmts-tests/src/test/resources/log4j2.properties delete mode 100644 deegree-tests/deegree-workspace-tests/src/test/resources/log4j2.properties diff --git a/deegree-core/deegree-connectionprovider-datasource/pom.xml b/deegree-core/deegree-connectionprovider-datasource/pom.xml index 0bd5c6957e..501442cb33 100644 --- a/deegree-core/deegree-connectionprovider-datasource/pom.xml +++ b/deegree-core/deegree-connectionprovider-datasource/pom.xml @@ -30,6 +30,12 @@ deegree-core-db ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + commons-beanutils commons-beanutils diff --git a/deegree-core/deegree-core-base/pom.xml b/deegree-core/deegree-core-base/pom.xml index b34cfac09d..34c1ecd9e7 100644 --- a/deegree-core/deegree-core-base/pom.xml +++ b/deegree-core/deegree-core-base/pom.xml @@ -21,6 +21,12 @@ deegree-core-coverage ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + commons-codec commons-codec diff --git a/deegree-core/deegree-core-commons/pom.xml b/deegree-core/deegree-core-commons/pom.xml index 6df8c2aa0a..8f86b2c75c 100644 --- a/deegree-core/deegree-core-commons/pom.xml +++ b/deegree-core/deegree-core-commons/pom.xml @@ -30,6 +30,12 @@ deegree-core-moduleinfo ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + jakarta.xml.bind jakarta.xml.bind-api diff --git a/deegree-core/deegree-core-coverage/pom.xml b/deegree-core/deegree-core-coverage/pom.xml index ac23364fe3..1f8db7e758 100644 --- a/deegree-core/deegree-core-coverage/pom.xml +++ b/deegree-core/deegree-core-coverage/pom.xml @@ -30,6 +30,12 @@ deegree-core-geometry ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + org.ehcache ehcache diff --git a/deegree-core/deegree-core-cs/pom.xml b/deegree-core/deegree-core-cs/pom.xml index edc629982d..4d2523bd22 100644 --- a/deegree-core/deegree-core-cs/pom.xml +++ b/deegree-core/deegree-core-cs/pom.xml @@ -35,6 +35,12 @@ deegree-core-annotations ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + jakarta.activation jakarta.activation-api diff --git a/deegree-core/deegree-core-cs/src/test/resources/log4j.properties b/deegree-core/deegree-core-cs/src/test/resources/log4j.properties deleted file mode 100644 index 76a05f856c..0000000000 --- a/deegree-core/deegree-core-cs/src/test/resources/log4j.properties +++ /dev/null @@ -1,137 +0,0 @@ -# by default, only log to stdout -log4j.rootLogger=ERROR, stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %5p: [%c{1}] %m%n - -## example log file appender -## ${context.name} as variable in log file names is NOT supported any more (it breaks more often than not) - -#log.dir=${catalina.base}/logs -#log4j.appender.logfile=org.apache.log4j.RollingFileAppender -#log4j.appender.logfile.File=${log.dir}/example.log -#log4j.appender.logfile.MaxFileSize=1000KB -## Keep one backup file -#log4j.appender.logfile.MaxBackupIndex=1 -#log4j.appender.logfile.layout=org.apache.log4j.PatternLayout -#log4j.appender.logfile.layout.ConversionPattern=%d %-5p [%c] %m%n - -# The log level for all classes that are not configured below. -log4j.logger.org.deegree = INFO -log4j.logger.org.deegree.cs.transformations.TransformationAccuracy = INFO -# automatically generated output follows - -# ====================================================================================================================== -# =============================================== Severe error messages ================================================ -# ====================================================================================================================== - -# ====================================================================================================================== -# =================================================== crs subsystem ==================================================== -# ====================================================================================================================== - - -## Get information about metadata of Coordinate System components. -#log4j.logger.org.deegree.cs.CRSIdentifiable = DEBUG - -## Get information about the transformation of a list of ordinates. -#log4j.logger.org.deegree.cs.CoordinateTransformer = DEBUG - -## Get information about created transformation chain. -#log4j.logger.org.deegree.cs.Transformer = DEBUG -log4j.logger.org.deegree.cs.transformations.TransformationFactory = INFO - -# ============================================= crs configuration logging ============================================== - - -## Output logging information on loading of Coordinate Systems from a configuration. -#log4j.logger.org.deegree.cs.configuration = DEBUG - -## Get information about initializing the xml file. -#log4j.logger.org.deegree.cs.configuration.resources.XMLFileResource = DEBUG - -## Get information about the currently exported coordinate system. -#log4j.logger.org.deegree.cs.io.deegree.CRSExporter = DEBUG - -## Get information about the currently exported coordinate system. -#log4j.logger.org.deegree.cs.io.deegree.CRSExporterBase = DEBUG - -## Get information about the initialization of the provider, as well as on requested objects. -#log4j.logger.org.deegree.cs.persistence.AbstractCRSStore = DEBUG - -## the deegree XML format provider -#log4j.logger.org.deegree.cs.persistence.deegree.d3.DeegreeCRSStore = DEBUG - -## Get information about the currently parsed crs, as well as a stack trace if something went wrong. -#log4j.logger.org.deegree.cs.persistence.deegree.d3.parsers.CoordinateSystemParser = DEBUG - -## Get information about the currently parsed datums, as well as a stack trace if something went wrong. -#log4j.logger.org.deegree.cs.persistence.deegree.d3.parsers.DatumParser = DEBUG - -## Get stacktraces if something goes wrong. -#log4j.logger.org.deegree.cs.persistence.deegree.d3.parsers.DefinitionParser = DEBUG - -## Get information about the currently parsed ellipsoid, as well as a stack trace if something went wrong. -#log4j.logger.org.deegree.cs.persistence.deegree.d3.parsers.EllipsoidParser = DEBUG - -## Get information about the currently parsed primemeridian, as well as a stack trace if something went wrong. -#log4j.logger.org.deegree.cs.persistence.deegree.d3.parsers.PrimemeridianParser = DEBUG - -## Get information about the currently parsed projections, as well as a stack trace if something went wrong. -#log4j.logger.org.deegree.cs.persistence.deegree.d3.parsers.ProjectionParser = DEBUG - -## Get information about the currently parsed transformation, as well as a stack trace if something went wrong. -#log4j.logger.org.deegree.cs.persistence.deegree.d3.parsers.TransformationParser = DEBUG - -## Get information about the currently parsed coordinate system components. -#log4j.logger.org.deegree.cs.persistence.gml.GMLCRSStore = DEBUG - -## Get information about the currently parsed transformations. -#log4j.logger.org.deegree.cs.persistence.gml.GMLFileResource = DEBUG - -## the proj4 format provider -#log4j.logger.org.deegree.cs.persistence.proj4.PROJ4CRSStore = DEBUG - -## Get information about errors while parsing the proj4 file. -#log4j.logger.org.deegree.cs.persistence.proj4.ProjFileResource = DEBUG - -# ================================================ projections logging ================================================= - - -## Get logging information about projections and the execution of projections. -#log4j.logger.org.deegree.cs.projections = DEBUG - -## Get information about incoming ordinates. -#log4j.logger.org.deegree.cs.projections.cylindric.Mercator = DEBUG - -## Get information about incoming ordinates of the (inverse) projection. -#log4j.logger.org.deegree.cs.projections.cylindric.TransverseMercator = DEBUG - -# =============================================== Transformation logging =============================================== - - -## Get information about transformations and the creation of transformation chains. -#log4j.logger.org.deegree.cs.transformations = DEBUG - -## Get information about the transformation steps which were 'automatically' created. -#log4j.logger.org.deegree.cs.transformations.TransformationFactory = DEBUG - -## Get information about the concatenation of two or more transformations. -#log4j.logger.org.deegree.cs.transformations.coordinate.ConcatenatedTransform = DEBUG - -## Get information about the incoming ordinates of a direct transformation. -#log4j.logger.org.deegree.cs.transformations.coordinate.DirectTransform = DEBUG - -## Get information about the incoming ordinates of a geocentric transformation. -#log4j.logger.org.deegree.cs.transformations.coordinate.GeocentricTransform = DEBUG - -## Get information about axis of the projection as well as the used projection and the incoming ordinates. -#log4j.logger.org.deegree.cs.transformations.coordinate.ProjectionTransform = DEBUG - -## Get stack traces if an error occurred while loading / transforming (on) a gridshift file. -#log4j.logger.org.deegree.cs.transformations.ntv2.NTv2Transformation = DEBUG - -## Get information transformation substitution process. -#log4j.logger.org.deegree.cs.utilities.MappingUtils = DEBUG - -## Get information about the swapping of axis and the creation of standardized values. -#log4j.logger.org.deegree.cs.utilities.Matrix = DEBUG \ No newline at end of file diff --git a/deegree-core/deegree-core-featureinfo/pom.xml b/deegree-core/deegree-core-featureinfo/pom.xml index 4b33414f01..f31a3376dd 100644 --- a/deegree-core/deegree-core-featureinfo/pom.xml +++ b/deegree-core/deegree-core-featureinfo/pom.xml @@ -40,6 +40,12 @@ deegree-core-base ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + org.antlr antlr-runtime diff --git a/deegree-core/deegree-core-geometry/pom.xml b/deegree-core/deegree-core-geometry/pom.xml index 62581e881b..d22a93a11b 100644 --- a/deegree-core/deegree-core-geometry/pom.xml +++ b/deegree-core/deegree-core-geometry/pom.xml @@ -30,6 +30,12 @@ deegree-core-cs ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + org.apache.commons commons-math diff --git a/deegree-core/deegree-core-layer/pom.xml b/deegree-core/deegree-core-layer/pom.xml index 412ea8115b..1998d94a32 100644 --- a/deegree-core/deegree-core-layer/pom.xml +++ b/deegree-core/deegree-core-layer/pom.xml @@ -78,6 +78,12 @@ deegree-core-workspace ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + jakarta.xml.bind jakarta.xml.bind-api diff --git a/deegree-core/deegree-core-metadata/pom.xml b/deegree-core/deegree-core-metadata/pom.xml index 669ea965ed..51f199e45a 100644 --- a/deegree-core/deegree-core-metadata/pom.xml +++ b/deegree-core/deegree-core-metadata/pom.xml @@ -21,6 +21,12 @@ deegree-core-base ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-commons/pom.xml b/deegree-core/deegree-core-protocol/deegree-protocol-commons/pom.xml index c1dab9d5bd..db1f62d659 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-commons/pom.xml +++ b/deegree-core/deegree-core-protocol/deegree-protocol-commons/pom.xml @@ -21,6 +21,12 @@ deegree-core-base ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + org.locationtech.jts jts-core diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-csw/pom.xml b/deegree-core/deegree-core-protocol/deegree-protocol-csw/pom.xml index 7677afb516..e0cf6b524f 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-csw/pom.xml +++ b/deegree-core/deegree-core-protocol/deegree-protocol-csw/pom.xml @@ -26,6 +26,12 @@ deegree-core-metadata ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/pom.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/pom.xml index 65241887e1..8fccc66e29 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wfs/pom.xml +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wfs/pom.xml @@ -21,6 +21,12 @@ deegree-protocol-commons ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wms/pom.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wms/pom.xml index cf6cf55a0e..f0182419f2 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wms/pom.xml +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wms/pom.xml @@ -41,6 +41,12 @@ deegree-layers-feature ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-core/deegree-core-protocol/deegree-protocol-wmts/pom.xml b/deegree-core/deegree-core-protocol/deegree-protocol-wmts/pom.xml index 89b04e572c..9f351a7ce8 100644 --- a/deegree-core/deegree-core-protocol/deegree-protocol-wmts/pom.xml +++ b/deegree-core/deegree-core-protocol/deegree-protocol-wmts/pom.xml @@ -30,7 +30,13 @@ org.deegree deegree-core-tile ${project.version} - + + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml index aded994be2..f1bf875238 100644 --- a/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml +++ b/deegree-core/deegree-core-remoteows/deegree-remoteows-wmts/pom.xml @@ -40,6 +40,12 @@ deegree-core-base ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-core/deegree-core-rendering-2d/pom.xml b/deegree-core/deegree-core-rendering-2d/pom.xml index b18c4a3d9b..aba3d4a355 100644 --- a/deegree-core/deegree-core-rendering-2d/pom.xml +++ b/deegree-core/deegree-core-rendering-2d/pom.xml @@ -31,6 +31,12 @@ deegree-core-style ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + javax.media jai-core diff --git a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-mssql/pom.xml b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-mssql/pom.xml index 7f41981e3e..d3f75945d0 100644 --- a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-mssql/pom.xml +++ b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-mssql/pom.xml @@ -26,6 +26,12 @@ deegree-core-db ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + com.microsoft.sqlserver mssql-jdbc diff --git a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml index d3e57a950b..b2198b7074 100644 --- a/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml +++ b/deegree-core/deegree-core-sqldialect/deegree-sqldialect-oracle/pom.xml @@ -26,6 +26,12 @@ deegree-core-db ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + com.oracle.database.jdbc ojdbc11 diff --git a/deegree-core/deegree-core-style/pom.xml b/deegree-core/deegree-core-style/pom.xml index 2311e785ea..2b2bad328d 100644 --- a/deegree-core/deegree-core-style/pom.xml +++ b/deegree-core/deegree-core-style/pom.xml @@ -26,6 +26,12 @@ deegree-core-db ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + org.apache.xmlgraphics batik-bridge diff --git a/deegree-core/deegree-core-test-logging/pom.xml b/deegree-core/deegree-core-test-logging/pom.xml new file mode 100644 index 0000000000..bcad2e4d17 --- /dev/null +++ b/deegree-core/deegree-core-test-logging/pom.xml @@ -0,0 +1,25 @@ + + 4.0.0 + deegree-core-test-logging + deegree-core-test-logging + jar + Logging dependencies and configuration for tests + + + ok + + + + org.deegree + deegree-core + 3.6.0-SNAPSHOT + + + + + org.apache.logging.log4j + log4j-slf4j2-impl + + + + diff --git a/deegree-core/deegree-core-test-logging/src/main/resources/log4j2.properties b/deegree-core/deegree-core-test-logging/src/main/resources/log4j2.properties new file mode 100644 index 0000000000..c061fccc30 --- /dev/null +++ b/deegree-core/deegree-core-test-logging/src/main/resources/log4j2.properties @@ -0,0 +1,13 @@ +status = error +name = deegreeTestLogConfig + +appenders = console + +appender.console.type = Console +appender.console.name = STDOUT +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d %p %C{1.} [%t] %m%n + +rootLogger.level = warn +rootLogger.appenderRefs = stdout +rootLogger.appenderRef.stdout.ref = STDOUT diff --git a/deegree-core/deegree-core-tile/pom.xml b/deegree-core/deegree-core-tile/pom.xml index 3267a062c3..a3db867ed6 100644 --- a/deegree-core/deegree-core-tile/pom.xml +++ b/deegree-core/deegree-core-tile/pom.xml @@ -21,6 +21,12 @@ deegree-core-base ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + org.mockito mockito-core diff --git a/deegree-core/pom.xml b/deegree-core/pom.xml index ca10f21792..ef2f59741d 100644 --- a/deegree-core/pom.xml +++ b/deegree-core/pom.xml @@ -36,6 +36,7 @@ deegree-core-protocol deegree-core-workspace deegree-connectionprovider-datasource + deegree-core-test-logging diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml index f049dd0571..755192ff0e 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-memory/pom.xml @@ -30,6 +30,12 @@ deegree-featurestore-commons ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml index b35207949c..543534d84f 100644 --- a/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml +++ b/deegree-datastores/deegree-featurestores/deegree-featurestore-sql/pom.xml @@ -53,6 +53,12 @@ ${project.version} test + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml index 2cbae81dd3..92d808afd8 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-ebrim-eo/pom.xml @@ -35,6 +35,12 @@ deegree-sqldialect-postgis ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + org.locationtech.jts jts-core diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml index ae11aaf483..0a903c18d6 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso-memory/pom.xml @@ -30,6 +30,12 @@ deegree-mdstore-commons ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml index c165b45734..520c20cc51 100644 --- a/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml +++ b/deegree-datastores/deegree-mdstores/deegree-mdstore-iso/pom.xml @@ -40,6 +40,12 @@ deegree-sqldialect-postgis ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml index 19144cadd6..94f7200ed9 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-filesystem/pom.xml @@ -38,6 +38,12 @@ deegree-tilestore-commons ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + com.sun.media jai-codec diff --git a/deegree-layers/deegree-layers-feature/pom.xml b/deegree-layers/deegree-layers-feature/pom.xml index acba60cb78..0d5cdb72c8 100644 --- a/deegree-layers/deegree-layers-feature/pom.xml +++ b/deegree-layers/deegree-layers-feature/pom.xml @@ -42,6 +42,12 @@ deegree-featurestore-commons ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-services/deegree-services-commons/pom.xml b/deegree-services/deegree-services-commons/pom.xml index 2c2811e7b4..ada4c621ee 100644 --- a/deegree-services/deegree-services-commons/pom.xml +++ b/deegree-services/deegree-services-commons/pom.xml @@ -59,6 +59,12 @@ ${project.version} provided + + org.deegree + deegree-core-test-logging + ${project.version} + test + - - - org.slf4j - slf4j-simple - ${slf4j.version} - - - - warn - -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Xms1024m -Xmx2048m --illegal-access=permit --add-opens java.base/java.lang=ALL-UNNAMED @@ -686,11 +675,6 @@ jul-to-slf4j ${slf4j.version} - - org.slf4j - slf4j-simple - ${slf4j.version} - jogl From 0edd93d8577f17e94dadc6d9835add55c9c19caa Mon Sep 17 00:00:00 2001 From: Dirk Stenger Date: Thu, 6 Jun 2024 19:10:09 +0200 Subject: [PATCH 2/5] Add dependency deegree-core-test-logging to further modules --- .../deegree-tilestores/deegree-tilestore-commons/pom.xml | 6 ++++++ .../deegree-tilestores/deegree-tilestore-remotewms/pom.xml | 6 ++++++ deegree-tools/deegree-tools-gml/pom.xml | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml index b284e4fe5b..bd3333cb94 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-commons/pom.xml @@ -30,6 +30,12 @@ deegree-core-tile ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml index b2486737e2..d547a75a31 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewms/pom.xml @@ -42,6 +42,12 @@ deegree-remoteows-wms ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit diff --git a/deegree-tools/deegree-tools-gml/pom.xml b/deegree-tools/deegree-tools-gml/pom.xml index 60086fd276..5acaa03be4 100755 --- a/deegree-tools/deegree-tools-gml/pom.xml +++ b/deegree-tools/deegree-tools-gml/pom.xml @@ -122,6 +122,12 @@ ${project.version} true + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit From 34ae45a00c49590ece99b7d6a327fd3353448517 Mon Sep 17 00:00:00 2001 From: Dirk Stenger Date: Fri, 7 Jun 2024 10:03:46 +0200 Subject: [PATCH 3/5] Add dependency deegree-core-test-logging to deegree-tilestore-remotewmts --- .../deegree-tilestores/deegree-tilestore-remotewmts/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml index 307f0840cf..1f3dcdc234 100644 --- a/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml +++ b/deegree-datastores/deegree-tilestores/deegree-tilestore-remotewmts/pom.xml @@ -41,6 +41,12 @@ deegree-remoteows-wmts ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + test + junit junit From 3d027fe53b7f6a88b354fe40e44a651fb438aad3 Mon Sep 17 00:00:00 2001 From: Dirk Stenger Date: Fri, 7 Jun 2024 11:49:22 +0200 Subject: [PATCH 4/5] Exclude log4j-to-slf4j from spring-boot-starter-batch --- deegree-tools/deegree-tools-gml/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deegree-tools/deegree-tools-gml/pom.xml b/deegree-tools/deegree-tools-gml/pom.xml index 5acaa03be4..f144261946 100755 --- a/deegree-tools/deegree-tools-gml/pom.xml +++ b/deegree-tools/deegree-tools-gml/pom.xml @@ -180,6 +180,10 @@ org.slf4j log4j-over-slf4j + + log4j-to-slf4j + org.apache.logging.log4j + From 6900d0e2fb5e4169d3b011cff9ba4e7228bc8c30 Mon Sep 17 00:00:00 2001 From: Dirk Stenger Date: Fri, 7 Jun 2024 12:40:03 +0200 Subject: [PATCH 5/5] Remove scope test from deegree-core-test-logging in deegree-tests modules and add dependency deegree-core-test-logging to two additonal deegree-tests modules --- deegree-tests/deegree-compliance-tests/pom.xml | 1 - deegree-tests/deegree-integration-tests/pom.xml | 1 - deegree-tests/deegree-resource-deps-tests/pom.xml | 5 +++++ deegree-tests/deegree-wms-remoteows-tests/pom.xml | 1 - deegree-tests/deegree-wms-similarity-tests/pom.xml | 1 - deegree-tests/deegree-wms-tiling-tests/pom.xml | 5 +++++ deegree-tests/deegree-wmts-tests/pom.xml | 1 - deegree-tests/deegree-workspace-tests/pom.xml | 1 - 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/deegree-tests/deegree-compliance-tests/pom.xml b/deegree-tests/deegree-compliance-tests/pom.xml index b818e64b02..ed668bed7e 100644 --- a/deegree-tests/deegree-compliance-tests/pom.xml +++ b/deegree-tests/deegree-compliance-tests/pom.xml @@ -182,7 +182,6 @@ org.deegree deegree-core-test-logging ${project.version} - test com.h2database diff --git a/deegree-tests/deegree-integration-tests/pom.xml b/deegree-tests/deegree-integration-tests/pom.xml index 10865050e5..db11416086 100644 --- a/deegree-tests/deegree-integration-tests/pom.xml +++ b/deegree-tests/deegree-integration-tests/pom.xml @@ -108,7 +108,6 @@ org.deegree deegree-core-test-logging ${project.version} - test \ No newline at end of file diff --git a/deegree-tests/deegree-resource-deps-tests/pom.xml b/deegree-tests/deegree-resource-deps-tests/pom.xml index 2af0705b84..04f5a087d7 100644 --- a/deegree-tests/deegree-resource-deps-tests/pom.xml +++ b/deegree-tests/deegree-resource-deps-tests/pom.xml @@ -22,6 +22,11 @@ deegree-featurestore-memory ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + junit junit diff --git a/deegree-tests/deegree-wms-remoteows-tests/pom.xml b/deegree-tests/deegree-wms-remoteows-tests/pom.xml index 4e26e50a72..d5f99d49f5 100644 --- a/deegree-tests/deegree-wms-remoteows-tests/pom.xml +++ b/deegree-tests/deegree-wms-remoteows-tests/pom.xml @@ -87,7 +87,6 @@ org.deegree deegree-core-test-logging ${project.version} - test junit diff --git a/deegree-tests/deegree-wms-similarity-tests/pom.xml b/deegree-tests/deegree-wms-similarity-tests/pom.xml index 0d01e842cb..e041ad694c 100644 --- a/deegree-tests/deegree-wms-similarity-tests/pom.xml +++ b/deegree-tests/deegree-wms-similarity-tests/pom.xml @@ -64,7 +64,6 @@ org.deegree deegree-core-test-logging ${project.version} - test junit diff --git a/deegree-tests/deegree-wms-tiling-tests/pom.xml b/deegree-tests/deegree-wms-tiling-tests/pom.xml index 62cf177341..b6c235b827 100644 --- a/deegree-tests/deegree-wms-tiling-tests/pom.xml +++ b/deegree-tests/deegree-wms-tiling-tests/pom.xml @@ -67,6 +67,11 @@ deegree-layers-tile ${project.version} + + org.deegree + deegree-core-test-logging + ${project.version} + junit junit diff --git a/deegree-tests/deegree-wmts-tests/pom.xml b/deegree-tests/deegree-wmts-tests/pom.xml index 047859d226..46ca2fc204 100644 --- a/deegree-tests/deegree-wmts-tests/pom.xml +++ b/deegree-tests/deegree-wmts-tests/pom.xml @@ -108,7 +108,6 @@ org.deegree deegree-core-test-logging ${project.version} - test it.geosolutions.imageio-ext diff --git a/deegree-tests/deegree-workspace-tests/pom.xml b/deegree-tests/deegree-workspace-tests/pom.xml index ba9309ecd5..4581dfb8cf 100644 --- a/deegree-tests/deegree-workspace-tests/pom.xml +++ b/deegree-tests/deegree-workspace-tests/pom.xml @@ -120,7 +120,6 @@ org.deegree deegree-core-test-logging ${project.version} - test junit