This is an automated email from the ASF dual-hosted git repository.

gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-json.git


The following commit(s) were added to refs/heads/master by this push:
     new 1a8be72  Update deps, replace deprecated enableDefaultTypingAsProperty 
with activateDefaultTypingAsProperty, remove Log4JLogger and replace with 
Log4J2Logger
1a8be72 is described below

commit 1a8be7231c01df42da30f41fdf961947951bf033
Author: Georg Kallidis <[email protected]>
AuthorDate: Mon Nov 27 11:30:44 2023 +0100

    Update deps, replace deprecated enableDefaultTypingAsProperty with 
activateDefaultTypingAsProperty, remove Log4JLogger and replace with 
Log4J2Logger
---
 api/pom.xml                                        | 11 ++++
 gson/pom.xml                                       | 10 ++-
 jackson/pom.xml                                    |  4 +-
 jackson2/pom.xml                                   | 12 +++-
 .../json/jackson/Jackson2MapperService.java        |  5 +-
 .../fulcrum/json/jackson/DefaultServiceTest.java   |  6 +-
 .../fulcrum/json/jackson/Jackson2MapperTest.java   |  6 +-
 .../JacksonMapperEnabledDefaultTypingTest.java     |  7 +-
 ...DefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java |  9 +--
 .../fulcrum/json/jackson/JacksonMapperTest.java    |  6 +-
 .../json/jackson/JsonOrgJacksonMapperTest.java     |  6 +-
 .../fulcrum/json/jackson/JsonPathJacksonTest.java  |  6 +-
 .../concurrent/JSONConcurrentJunit5Test.java       |  7 +-
 .../jackson/concurrent/JSONConcurrentTest.java     |  4 +-
 pom.xml                                            | 74 ++++++++++++----------
 15 files changed, 105 insertions(+), 68 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 9843fcd..cfe87ea 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -39,6 +39,17 @@
             <artifactId>avalon-framework-api</artifactId>
             <version>4.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+              <scope>test</scope>
+        </dependency>
+         <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src/java</sourceDirectory>
diff --git a/gson/pom.xml b/gson/pom.xml
index 8fee258..34ada05 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -61,7 +61,7 @@
                <dependency>
                    <groupId>org.apache.commons</groupId>
                    <artifactId>commons-lang3</artifactId>
-                   <version>3.12.0</version>
+                   <version>3.13.0</version>
                </dependency>    
         <dependency>
             <groupId>org.apache.avalon.framework</groupId>
@@ -76,9 +76,15 @@
         <dependency>
             <groupId>org.apache.fulcrum</groupId>
             <artifactId>fulcrum-yaafi</artifactId>
-            <version>1.0.8</version>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+              <scope>test</scope>
+        </dependency>
         <dependency>
            <groupId>com.google.code.gson</groupId>
            <artifactId>gson</artifactId>
diff --git a/jackson/pom.xml b/jackson/pom.xml
index d9f7302..7cf7ce7 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
+            <version>3.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.avalon.framework</groupId>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.apache.fulcrum</groupId>
             <artifactId>fulcrum-yaafi</artifactId>
-            <version>1.0.8</version>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/jackson2/pom.xml b/jackson2/pom.xml
index a4f6574..d50d156 100644
--- a/jackson2/pom.xml
+++ b/jackson2/pom.xml
@@ -75,9 +75,15 @@
         <dependency>
             <groupId>org.apache.fulcrum</groupId>
             <artifactId>fulcrum-yaafi</artifactId>
-            <version>1.0.8</version>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+              <scope>test</scope>
+        </dependency>
         <dependency>
           <groupId>com.fasterxml.jackson.core</groupId>
           <artifactId>jackson-core</artifactId>
@@ -137,7 +143,7 @@
     <properties>
         <!-- 2.7.x hase Java 7 baseline, but is compiled with Java 6 support, 
cft. https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.7.
          2.14 has java 8 baseline, with Jackson 2.8, Java 7 languages features 
will be allowed -->
-        <jackson2.version>2.14.2</jackson2.version>
+        <jackson2.version>2.16.0</jackson2.version>
     </properties>
     <profiles>
       <profile>
@@ -150,7 +156,7 @@
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-runtime</artifactId>
-                <version>4.0.2</version>
+                <version>4.0.3</version>
             </dependency>
         </dependencies>
       </profile>
diff --git 
a/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java 
b/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
index 878e035..9b0ed73 100644
--- 
a/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
+++ 
b/jackson2/src/java/org/apache/fulcrum/json/jackson/Jackson2MapperService.java
@@ -710,7 +710,10 @@ public class Jackson2MapperService extends 
AbstractLogEnabled implements JsonSer
     private void initDefaultTyping() {
         if (defaultTypeDefs != null && defaultTypeDefs.length == 2) {
             DefaultTyping defaultTyping = 
DefaultTyping.valueOf(defaultTypeDefs[0]);
-            mapper.enableDefaultTypingAsProperty(defaultTyping, 
defaultTypeDefs[1]);
+            //mapper.enableDefaultTypingAsProperty(defaultTyping, 
defaultTypeDefs[1]);
+            
mapper.activateDefaultTypingAsProperty(mapper.getPolymorphicTypeValidator(), 
+                    defaultTyping, defaultTypeDefs[1]);
+            
             getLogger().info("default typing is " + defaultTypeDefs[0] + " 
with key:" + defaultTypeDefs[1]);
         }
     }
diff --git 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
index a879bb2..737aa7b 100644
--- a/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
+++ b/jackson2/src/test/org/apache/fulcrum/json/jackson/DefaultServiceTest.java
@@ -31,7 +31,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.avalon.framework.logger.Log4JLogger;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.fulcrum.json.JsonService;
 import org.apache.fulcrum.json.jackson.example.Bean;
@@ -46,7 +45,8 @@ import 
org.apache.fulcrum.json.jackson.serializers.TestDummyWrapperDeserializer;
 import org.apache.fulcrum.json.jackson.serializers.TestJsonSerializer;
 import org.apache.fulcrum.json.jackson.serializers.TestSerializer;
 import org.apache.fulcrum.testcontainer.BaseUnit5Test;
-import org.apache.log4j.LogManager;
+import org.apache.fulcrum.yaafi.framework.logger.Log4j2Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestReporter;
@@ -83,7 +83,7 @@ public class DefaultServiceTest extends BaseUnit5Test {
         */
        @BeforeEach
        public void setUp() throws Exception {
-               logger = new 
Log4JLogger(LogManager.getLogger(getClass().getName()) );
+               logger = new 
Log4j2Logger(LogManager.getLogger(getClass().getName()) );
                                //new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG);
                sc = (JsonService) this.lookup(JsonService.ROLE);
        }
diff --git 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/Jackson2MapperTest.java 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/Jackson2MapperTest.java
index 2c117c0..5b504d6 100644
--- a/jackson2/src/test/org/apache/fulcrum/json/jackson/Jackson2MapperTest.java
+++ b/jackson2/src/test/org/apache/fulcrum/json/jackson/Jackson2MapperTest.java
@@ -20,13 +20,13 @@ package org.apache.fulcrum.json.jackson;
  */
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.apache.avalon.framework.logger.Log4JLogger;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.fulcrum.json.JsonService;
 import org.apache.fulcrum.json.jackson.example.Bean;
 import org.apache.fulcrum.json.jackson.example.Rectangle;
 import org.apache.fulcrum.testcontainer.BaseUnit5Test;
-import org.apache.log4j.LogManager;
+import org.apache.fulcrum.yaafi.framework.logger.Log4j2Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -47,7 +47,7 @@ public class Jackson2MapperTest extends BaseUnit5Test {
     @BeforeEach
     public void setUp() throws Exception {
         sc = (JsonService) this.lookup(JsonService.ROLE);
-        logger = new Log4JLogger(LogManager.getLogger(getClass().getName()) );
+        logger = new Log4j2Logger(LogManager.getLogger(getClass().getName()) );
         // clear 
         ((Jackson2MapperService)sc).setMixins(null,null);
         logger.debug( "cleared mixins");
diff --git 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTypingTest.java
 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTypingTest.java
index 2e9e6b5..2b9b8bb 100644
--- 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTypingTest.java
+++ 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTypingTest.java
@@ -41,7 +41,8 @@ import org.apache.fulcrum.json.jackson.mixins.RectangleMixin;
 import org.apache.fulcrum.json.jackson.mixins.RectangleMixin2;
 import org.apache.fulcrum.json.jackson.mixins.TypedRectangle;
 import org.apache.fulcrum.testcontainer.BaseUnit5Test;
-import org.apache.log4j.LogManager;
+import org.apache.fulcrum.yaafi.framework.logger.Log4j2Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -68,8 +69,8 @@ public class JacksonMapperEnabledDefaultTypingTest extends 
BaseUnit5Test {
     @BeforeEach
     public void setUp() throws Exception {
         sc = (JsonService) this.lookup(JsonService.ROLE);
-        logger = new Log4JLogger(LogManager.getLogger(getClass().getName()) );
-        ((Jackson2MapperService) sc).getMapper().enableDefaultTypingAsProperty(
+        logger = new Log4j2Logger(LogManager.getLogger(getClass().getName()) );
+        ((Jackson2MapperService) 
sc).getMapper().activateDefaultTypingAsProperty(((Jackson2MapperService) 
sc).getMapper().getPolymorphicTypeValidator(), 
                 DefaultTyping.NON_FINAL, "type");
     }
     @Test
diff --git 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
index 9399d72..24ef5dd 100644
--- 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
+++ 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
@@ -32,7 +32,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
 
-import org.apache.avalon.framework.logger.Log4JLogger;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.fulcrum.json.JsonService;
 import org.apache.fulcrum.json.jackson.example.Bean;
@@ -43,7 +42,8 @@ import org.apache.fulcrum.json.jackson.mixins.RectangleMixin;
 import org.apache.fulcrum.json.jackson.mixins.RectangleMixin2;
 import org.apache.fulcrum.json.jackson.mixins.TypedRectangle;
 import org.apache.fulcrum.testcontainer.BaseUnit5Test;
-import org.apache.log4j.LogManager;
+import org.apache.fulcrum.yaafi.framework.logger.Log4j2Logger;
+import org.apache.logging.log4j.LogManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -69,8 +69,9 @@ public class 
JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test exte
     @BeforeEach
     public void setUp() throws Exception {
         sc = (JsonService) this.lookup(JsonService.ROLE);
-        logger = new Log4JLogger(LogManager.getLogger(getClass().getName()) );
-        ((Jackson2MapperService) sc).getMapper().enableDefaultTypingAsProperty(
+        logger = new Log4j2Logger(LogManager.getLogger(getClass().getName()) 
);        
+        ((Jackson2MapperService) 
sc).getMapper().activateDefaultTypingAsProperty(
+                ((Jackson2MapperService) 
sc).getMapper().getPolymorphicTypeValidator(), 
                 DefaultTyping.OBJECT_AND_NON_CONCRETE, "type");
     }
    
diff --git 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java
index 7ee4b30..d3cc709 100644
--- a/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java
+++ b/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperTest.java
@@ -30,7 +30,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.logger.Log4JLogger;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.fulcrum.json.JsonService;
 import org.apache.fulcrum.json.jackson.example.Bean;
@@ -40,7 +39,8 @@ import org.apache.fulcrum.json.jackson.mixins.BeanMixin;
 import org.apache.fulcrum.json.jackson.mixins.RectangleMixin;
 import org.apache.fulcrum.json.jackson.mixins.RectangleMixin2;
 import org.apache.fulcrum.testcontainer.BaseUnit5Test;
-import org.apache.log4j.LogManager;
+import org.apache.fulcrum.yaafi.framework.logger.Log4j2Logger;
+import org.apache.logging.log4j.LogManager;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.jupiter.api.BeforeEach;
@@ -65,7 +65,7 @@ public class JacksonMapperTest extends BaseUnit5Test {
     @BeforeEach
     public void setUp() throws Exception {
         sc = (JsonService) this.lookup(JsonService.ROLE);
-        logger = new Log4JLogger(LogManager.getLogger(getClass().getName()) );
+        logger = new Log4j2Logger(LogManager.getLogger(getClass().getName()) );
     }
 
     @Test
diff --git 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java
 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java
index 4ede597..7dfee49 100644
--- 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java
+++ 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonOrgJacksonMapperTest.java
@@ -27,12 +27,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.avalon.framework.logger.Log4JLogger;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.fulcrum.json.JsonService;
 import org.apache.fulcrum.json.jackson.example.Bean;
 import org.apache.fulcrum.testcontainer.BaseUnit5Test;
-import org.apache.log4j.LogManager;
+import org.apache.fulcrum.yaafi.framework.logger.Log4j2Logger;
+import org.apache.logging.log4j.LogManager;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.jupiter.api.BeforeEach;
@@ -58,7 +58,7 @@ public class JsonOrgJacksonMapperTest extends BaseUnit5Test {
         sc = (JsonService) this.lookup(JsonService.ROLE);
         sc.addAdapter(null, null,new JsonOrgModule());
         //((Jackson2MapperService)sc).registerModule(new JsonOrgModule());
-        logger = new Log4JLogger(LogManager.getLogger(getClass().getName()) );
+        logger = new Log4j2Logger(LogManager.getLogger(getClass().getName()) );
     }
     
     // support for org.json mapping 
diff --git 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java
index 5f0b399..eb01b43 100644
--- a/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java
+++ b/jackson2/src/test/org/apache/fulcrum/json/jackson/JsonPathJacksonTest.java
@@ -29,14 +29,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.avalon.framework.logger.Log4JLogger;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.fulcrum.json.JsonService;
 import org.apache.fulcrum.json.jackson.example.Bean;
 import org.apache.fulcrum.json.jackson.example.Rectangle;
 import org.apache.fulcrum.json.jackson.example.TestClass;
 import org.apache.fulcrum.testcontainer.BaseUnit5Test;
-import org.apache.log4j.LogManager;
+import org.apache.fulcrum.yaafi.framework.logger.Log4j2Logger;
+import org.apache.logging.log4j.LogManager;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.jupiter.api.BeforeEach;
@@ -64,7 +64,7 @@ public class JsonPathJacksonTest extends BaseUnit5Test {
     @BeforeEach
     public void setUp() throws Exception {
         sc = (JsonService) this.lookup(JsonService.ROLE);
-        logger = new Log4JLogger(LogManager.getLogger(getClass().getName()) );
+        logger = new Log4j2Logger(LogManager.getLogger(getClass().getName()) );
         try {
             Configuration conf = Configuration.defaultConfiguration();
             logger.debug("jayway jsonpath conf:"+ conf.jsonProvider());
diff --git 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentJunit5Test.java
 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentJunit5Test.java
index c99a3a9..e5ef84a 100644
--- 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentJunit5Test.java
+++ 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentJunit5Test.java
@@ -178,8 +178,11 @@ public class JSONConcurrentJunit5Test extends 
BaseUnit5Test {
             ObjectMapper objectMapper = null;
             if (withType) {
                 // without copy tests will fail in testsRunInParallel
-                objectMapper = ((Jackson2MapperService) 
jsonService).getMapper().copy();
-                
objectMapper.enableDefaultTypingAsProperty(DefaultTyping.NON_FINAL, "type");
+                objectMapper = ((Jackson2MapperService) 
jsonService).getMapper().copy(); 
+                objectMapper.activateDefaultTypingAsProperty(
+                        objectMapper.getPolymorphicTypeValidator(), 
+                        DefaultTyping.NON_FINAL, "type");
+                
                 AnnotationIntrospector ai = 
objectMapper.getSerializationConfig().getAnnotationIntrospector();
                 AnnotationIntrospector siai = new SimpleNameIntrospector();
                 AnnotationIntrospector pair = new 
AnnotationIntrospectorPair(siai, ai);
diff --git 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentTest.java
 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentTest.java
index 4a30e59..a85986e 100644
--- 
a/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentTest.java
+++ 
b/jackson2/src/test/org/apache/fulcrum/json/jackson/concurrent/JSONConcurrentTest.java
@@ -181,7 +181,9 @@ public class JSONConcurrentTest extends BaseUnit4Test {
             if (withType) {
                 // without copy tests will fail in testsRunInParallel
                 objectMapper = ((Jackson2MapperService) 
jsonService).getMapper().copy();
-                
objectMapper.enableDefaultTypingAsProperty(DefaultTyping.NON_FINAL, "type");
+                objectMapper.activateDefaultTypingAsProperty(
+                        objectMapper.getPolymorphicTypeValidator(), 
+                        DefaultTyping.NON_FINAL, "type");
                 AnnotationIntrospector ai = 
objectMapper.getSerializationConfig().getAnnotationIntrospector();
                 AnnotationIntrospector siai = new SimpleNameIntrospector();
                 AnnotationIntrospector pair = new 
AnnotationIntrospectorPair(siai, ai);
diff --git a/pom.xml b/pom.xml
index d52b744..59a0f21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
    <parent>
        <artifactId>turbine-parent</artifactId>
        <groupId>org.apache.turbine</groupId>
-       <version>12-SNAPSHOT</version>
+       <version>12</version>
        <relativePath />
    </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -136,40 +136,44 @@
          </plugins>
     </reporting>
     
-    <dependencies>
-       <dependency>
-          <groupId>org.apache.fulcrum</groupId>
-          <artifactId>fulcrum-testcontainer</artifactId>
-          <version>1.0.9</version>
-          <scope>test</scope>
-        </dependency>
-         <!-- Log4j2 should be used by default, removed optional -->
-        <dependency>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-api</artifactId>
-          <version>${turbine.log4j2.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-           <groupId>org.apache.logging.log4j</groupId>
-           <artifactId>log4j-core</artifactId>
-           <version>${turbine.log4j2.version}</version>
-           <scope>test</scope>
-        </dependency>
-        <!-- log4j1.2 bridge instead of log4j -->
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-1.2-api</artifactId>
-            <version>${turbine.log4j2.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>1.9.2</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+     <dependencyManagement>
+        <dependencies>
+           <dependency>
+              <groupId>org.apache.fulcrum</groupId>
+              <artifactId>fulcrum-testcontainer</artifactId>
+              <version>2.0.0</version>
+              <scope>test</scope>
+            </dependency>
+             <!-- Log4j2 should be used by default, removed optional -->
+            <dependency>
+               <groupId>org.apache.logging.log4j</groupId>
+               <artifactId>log4j-core</artifactId>
+               <version>${turbine.log4j2.version}</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.platform</groupId>
+                <artifactId>junit-platform-runner</artifactId>
+                <version>1.9.3</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+     </dependencyManagement>
+     
+     <dependencies>
+           <dependency>
+              <groupId>org.apache.fulcrum</groupId>
+              <artifactId>fulcrum-testcontainer</artifactId>
+            </dependency>
+            <dependency>
+               <groupId>org.apache.logging.log4j</groupId>
+               <artifactId>log4j-core</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.platform</groupId>
+                <artifactId>junit-platform-runner</artifactId>
+            </dependency>
+        </dependencies>
      
     <properties>
       <turbine.site.path>turbine-fulcrum-json</turbine.site.path>

Reply via email to