From cc672a684d831a026e0738c97b4cc4e9d82f9b23 Mon Sep 17 00:00:00 2001 From: davidtrafela Date: Wed, 29 Nov 2023 13:47:19 +0100 Subject: [PATCH] Updated project to Java 21, migrated to Jakarta namespace, updated dependencies to latest versions. --- audit/pom.xml | 14 ++++--- .../kumuluz/ee/logs/audit/AuditLogUtil.java | 8 ++-- .../logs/audit/annotations/AuditProperty.java | 2 +- .../ee/logs/audit/annotations/LogAudit.java | 5 ++- .../kumuluz/ee/logs/audit/cdi/AuditLog.java | 7 ++-- .../cdi/interceptors/LogAuditInterceptor.java | 12 +++--- .../ee/logs/audit/filters/AuditLogFilter.java | 22 +++++------ .../ee/logs/audit/cdi/AuditLogTest.java | 22 +++++------ .../ee/logs/audit/cdi/AuditResourceTest.java | 33 ++++++++--------- .../audit/test/beans/TestAuditedBean.java | 2 +- .../audit/test/beans/TestAuditedResource.java | 10 ++--- .../ee/logs/audit/test/beans/TestRestApp.java | 4 +- common/pom.xml | 2 +- .../java/com/kumuluz/ee/logs/cdi/Log.java | 8 ++-- .../logs/cdi/interceptors/LogInterceptor.java | 10 ++--- fluentd/pom.xml | 2 +- jul/pom.xml | 2 +- log4j2/pom.xml | 2 +- pom.xml | 37 +++++++++++-------- 19 files changed, 107 insertions(+), 97 deletions(-) diff --git a/audit/pom.xml b/audit/pom.xml index 6a02be0..249f346 100644 --- a/audit/pom.xml +++ b/audit/pom.xml @@ -5,7 +5,7 @@ kumuluzee-logs com.kumuluz.ee.logs - 1.5.0-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 @@ -31,8 +31,8 @@ org.jboss.weld - weld-junit4 - ${weld-junit4.version} + weld-junit5 + ${weld-junit5.version} test @@ -41,8 +41,12 @@ test - org.jboss.arquillian.junit - arquillian-junit-container + jakarta.ws.rs + jakarta.ws.rs-api + + + org.jboss.arquillian.junit5 + arquillian-junit5-container test diff --git a/audit/src/main/java/com/kumuluz/ee/logs/audit/AuditLogUtil.java b/audit/src/main/java/com/kumuluz/ee/logs/audit/AuditLogUtil.java index 2d2063c..7fdbac5 100644 --- a/audit/src/main/java/com/kumuluz/ee/logs/audit/AuditLogUtil.java +++ b/audit/src/main/java/com/kumuluz/ee/logs/audit/AuditLogUtil.java @@ -24,11 +24,11 @@ import com.kumuluz.ee.logs.audit.annotations.AuditObjectParam; import com.kumuluz.ee.logs.audit.annotations.LogAudit; import com.kumuluz.ee.logs.audit.types.AuditProperty; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.UriInfo; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.UriInfo; import java.lang.reflect.Parameter; import java.util.Optional; import java.util.Set; diff --git a/audit/src/main/java/com/kumuluz/ee/logs/audit/annotations/AuditProperty.java b/audit/src/main/java/com/kumuluz/ee/logs/audit/annotations/AuditProperty.java index 52724b7..6ddc661 100644 --- a/audit/src/main/java/com/kumuluz/ee/logs/audit/annotations/AuditProperty.java +++ b/audit/src/main/java/com/kumuluz/ee/logs/audit/annotations/AuditProperty.java @@ -20,7 +20,7 @@ */ package com.kumuluz.ee.logs.audit.annotations; -import javax.enterprise.util.Nonbinding; +import jakarta.enterprise.util.Nonbinding; /** * @author Gregor Porocnik diff --git a/audit/src/main/java/com/kumuluz/ee/logs/audit/annotations/LogAudit.java b/audit/src/main/java/com/kumuluz/ee/logs/audit/annotations/LogAudit.java index 83df588..836137d 100644 --- a/audit/src/main/java/com/kumuluz/ee/logs/audit/annotations/LogAudit.java +++ b/audit/src/main/java/com/kumuluz/ee/logs/audit/annotations/LogAudit.java @@ -20,8 +20,9 @@ */ package com.kumuluz.ee.logs.audit.annotations; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; + import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/audit/src/main/java/com/kumuluz/ee/logs/audit/cdi/AuditLog.java b/audit/src/main/java/com/kumuluz/ee/logs/audit/cdi/AuditLog.java index 776c982..8e1376a 100644 --- a/audit/src/main/java/com/kumuluz/ee/logs/audit/cdi/AuditLog.java +++ b/audit/src/main/java/com/kumuluz/ee/logs/audit/cdi/AuditLog.java @@ -28,9 +28,9 @@ import com.kumuluz.ee.logs.audit.loggers.NoOpAuditLogger; import com.kumuluz.ee.logs.audit.types.AuditProperty; import com.kumuluz.ee.logs.audit.types.DataAuditAction; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.RequestScoped; -import javax.annotation.PostConstruct; -import javax.enterprise.context.RequestScoped; import java.lang.reflect.InvocationTargetException; import java.util.Optional; @@ -80,7 +80,8 @@ public void init() { this.auditLogger = (AuditLogger) clazz.getDeclaredConstructor().newInstance(); return; } - } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | InstantiationException | ClassNotFoundException e) { + } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException | InstantiationException | + ClassNotFoundException e) { LOG.warn("Unable to create instance of provided class {}", auditLoggerClass.get()); } diff --git a/audit/src/main/java/com/kumuluz/ee/logs/audit/cdi/interceptors/LogAuditInterceptor.java b/audit/src/main/java/com/kumuluz/ee/logs/audit/cdi/interceptors/LogAuditInterceptor.java index dcf7de0..b2b9313 100644 --- a/audit/src/main/java/com/kumuluz/ee/logs/audit/cdi/interceptors/LogAuditInterceptor.java +++ b/audit/src/main/java/com/kumuluz/ee/logs/audit/cdi/interceptors/LogAuditInterceptor.java @@ -26,13 +26,13 @@ import com.kumuluz.ee.logs.audit.annotations.AuditProperty; import com.kumuluz.ee.logs.audit.annotations.LogAudit; import com.kumuluz.ee.logs.audit.cdi.AuditLog; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.ws.rs.Path; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.ws.rs.Path; import java.lang.reflect.Method; import java.lang.reflect.Parameter; import java.util.Set; diff --git a/audit/src/main/java/com/kumuluz/ee/logs/audit/filters/AuditLogFilter.java b/audit/src/main/java/com/kumuluz/ee/logs/audit/filters/AuditLogFilter.java index 6c77e14..571c569 100644 --- a/audit/src/main/java/com/kumuluz/ee/logs/audit/filters/AuditLogFilter.java +++ b/audit/src/main/java/com/kumuluz/ee/logs/audit/filters/AuditLogFilter.java @@ -27,18 +27,18 @@ import com.kumuluz.ee.logs.audit.cdi.AuditLog; import com.kumuluz.ee.logs.audit.types.AuditProperty; import com.kumuluz.ee.logs.audit.types.DataAuditAction; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Provider; import java.lang.reflect.Method; import java.lang.reflect.Parameter; import java.net.URI; diff --git a/audit/src/test/java/com/kumuluz/ee/logs/audit/cdi/AuditLogTest.java b/audit/src/test/java/com/kumuluz/ee/logs/audit/cdi/AuditLogTest.java index 5850659..c103c2f 100644 --- a/audit/src/test/java/com/kumuluz/ee/logs/audit/cdi/AuditLogTest.java +++ b/audit/src/test/java/com/kumuluz/ee/logs/audit/cdi/AuditLogTest.java @@ -31,15 +31,15 @@ import com.kumuluz.ee.logs.audit.types.DataAuditAction; import com.kumuluz.ee.logs.messages.LogMessage; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.resolver.api.maven.Maven; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import javax.inject.Inject; import java.util.LinkedList; @@ -49,12 +49,12 @@ import static com.kumuluz.ee.logs.audit.cdi.AuditLog.CONFIG_AUDIT_LOG_ENABLE; import static com.kumuluz.ee.logs.audit.cdi.AuditLog.CONFIG_AUDIT_LOG_LOGGER_CLASS; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @author Gregor Porocnik */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AuditLogTest { @Deployment @@ -78,7 +78,7 @@ public static WebArchive createDeployment() { @Inject private AuditLog auditLog; - @Before + @BeforeAll public void before() { System.setProperty(CONFIG_AUDIT_LOG_LOGGER_CLASS, KumuluzAuditLogger.class.getName()); TestLogger.setMessages(new LinkedList<>()); @@ -106,7 +106,7 @@ public void shouldLogAuditWithGenericApi() { } @Test - public void shouldLogAudit() { + void shouldLogAudit() { auditLog.log("exampleMethodName", "exampleObjectType", "exampleAction", "id", new AuditProperty("propName", "propValue")); auditLog.flush(); @@ -123,7 +123,7 @@ public void shouldLogAudit() { } @Test - public void shouldLogNullWithNullParams() { + void shouldLogNullWithNullParams() { auditLog.log(null, null, (DataAuditAction) null, null, null); auditLog.flush(); @@ -139,7 +139,7 @@ public void shouldLogNullWithNullParams() { } @Test - public void disabledAuditShouldNotLog() { + void disabledAuditShouldNotLog() { System.setProperty(CONFIG_AUDIT_LOG_ENABLE, "false"); @@ -154,7 +154,7 @@ public void disabledAuditShouldNotLog() { } @Test - public void shouldLogAuditWithCustomAuditLogger() { + void shouldLogAuditWithCustomAuditLogger() { System.setProperty(CONFIG_AUDIT_LOG_LOGGER_CLASS, TestAuditLogger.class.getName()); diff --git a/audit/src/test/java/com/kumuluz/ee/logs/audit/cdi/AuditResourceTest.java b/audit/src/test/java/com/kumuluz/ee/logs/audit/cdi/AuditResourceTest.java index f8d243e..33d1201 100644 --- a/audit/src/test/java/com/kumuluz/ee/logs/audit/cdi/AuditResourceTest.java +++ b/audit/src/test/java/com/kumuluz/ee/logs/audit/cdi/AuditResourceTest.java @@ -27,19 +27,20 @@ import com.kumuluz.ee.logs.audit.test.loggers.TestLogConfigurator; import com.kumuluz.ee.logs.audit.test.loggers.TestLogger; import com.kumuluz.ee.logs.messages.LogMessage; +import org.jboss.arquillian.container.test.api.BeforeDeployment; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.junit5.ArquillianExtension; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.resolver.api.maven.Maven; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.io.IOException; import java.net.HttpURLConnection; +import java.net.URI; import java.net.URL; import java.util.LinkedList; import java.util.List; @@ -47,19 +48,17 @@ import java.util.ResourceBundle; import static com.kumuluz.ee.logs.audit.cdi.AuditLog.CONFIG_AUDIT_LOG_ENABLE; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Gregor Porocnik */ -@RunWith(Arquillian.class) +@ExtendWith(ArquillianExtension.class) public class AuditResourceTest { - @Deployment public static WebArchive createDeployment() { - ResourceBundle versionsBundle = ResourceBundle.getBundle("META-INF/kumuluzee/logs/audit/versions"); WebArchive jar = ShrinkWrap @@ -70,20 +69,20 @@ public static WebArchive createDeployment() { .addAsResource("META-INF/services/com.kumuluz.ee.logs.LogCommons") .addAsResource("META-INF/services/com.kumuluz.ee.logs.LogConfigurator") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); - jar.merge(Maven.resolver().resolve("com.kumuluz.ee.logs:kumuluzee-logs-common:"+ versionsBundle.getString("kumuluzee-logs-common-version")).withoutTransitivity().asSingle(JavaArchive.class)); + jar.merge(Maven.resolver().resolve("com.kumuluz.ee.logs:kumuluzee-logs-common:" + versionsBundle.getString("kumuluzee-logs-common-version")).withoutTransitivity().asSingle(JavaArchive.class)); return jar; } - @Before + @BeforeDeployment public void before() { System.setProperty(CONFIG_AUDIT_LOG_ENABLE, "true"); TestLogger.setMessages(new LinkedList<>()); } @Test - public void shouldLogClassAnnotatedAuditGetResourceWithParams() throws IOException { - URL url = new URL("http://localhost:8080/resourceName/parentInputParamIds/inputParamId?obj=1234"); + void shouldLogClassAnnotatedAuditGetResourceWithParams() throws IOException { + URL url = URI.create("http://localhost:8080/resourceName/parentInputParamIds/inputParamId?obj=1234").toURL(); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setRequestMethod("GET"); connection.connect(); @@ -91,7 +90,7 @@ public void shouldLogClassAnnotatedAuditGetResourceWithParams() throws IOExcepti assertEquals(200, connection.getResponseCode()); List messages = TestLogger.getMessages(); - messages.stream().forEach(this::debugMsg); + messages.forEach(this::debugMsg); assertEquals(1, messages.size()); LogMessage logMessage = messages.get(0); @@ -107,12 +106,11 @@ public void shouldLogClassAnnotatedAuditGetResourceWithParams() throws IOExcepti assertEquals("resPropVal2", fields.get("resPropName2")); //resource parameters not annotated with auditObjectParam are not included assertNull(fields.get("parentId")); - } @Test - public void shouldLogClassAnnotatedAuditPostResourceWithParams() throws IOException { - URL url = new URL("http://localhost:8080/resourceName?obj=4321"); + void shouldLogClassAnnotatedAuditPostResourceWithParams() throws IOException { + URL url = URI.create(("http://localhost:8080/resourceName?obj=4321")).toURL(); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setRequestMethod("POST"); connection.connect(); @@ -133,7 +131,6 @@ public void shouldLogClassAnnotatedAuditPostResourceWithParams() throws IOExcept //assert class anotated properties since method does not have AuditLog annotation assertEquals("resPropVal1", fields.get("resPropName1")); assertEquals("resPropVal2", fields.get("resPropName2")); - } private void debugMsg(LogMessage logMessage) { diff --git a/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestAuditedBean.java b/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestAuditedBean.java index d595ea8..451aadc 100644 --- a/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestAuditedBean.java +++ b/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestAuditedBean.java @@ -23,8 +23,8 @@ import com.kumuluz.ee.logs.audit.annotations.AuditObjectParam; import com.kumuluz.ee.logs.audit.annotations.AuditProperty; import com.kumuluz.ee.logs.audit.annotations.LogAudit; +import jakarta.enterprise.context.ApplicationScoped; -import javax.enterprise.context.ApplicationScoped; import java.util.UUID; /** diff --git a/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestAuditedResource.java b/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestAuditedResource.java index 7b9a1da..779a4f4 100644 --- a/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestAuditedResource.java +++ b/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestAuditedResource.java @@ -23,12 +23,12 @@ import com.kumuluz.ee.logs.audit.annotations.AuditObjectParam; import com.kumuluz.ee.logs.audit.annotations.AuditProperty; import com.kumuluz.ee.logs.audit.annotations.LogAudit; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import java.util.UUID; /** diff --git a/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestRestApp.java b/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestRestApp.java index 5a46e02..e8afbae 100644 --- a/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestRestApp.java +++ b/audit/src/test/java/com/kumuluz/ee/logs/audit/test/beans/TestRestApp.java @@ -21,9 +21,9 @@ package com.kumuluz.ee.logs.audit.test.beans; import com.kumuluz.ee.logs.audit.filters.AuditLogFilter; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; import java.util.HashSet; import java.util.Set; diff --git a/common/pom.xml b/common/pom.xml index 16883ad..f634e36 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ kumuluzee-logs com.kumuluz.ee.logs - 1.5.0-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/common/src/main/java/com/kumuluz/ee/logs/cdi/Log.java b/common/src/main/java/com/kumuluz/ee/logs/cdi/Log.java index e0e8584..df8fc32 100644 --- a/common/src/main/java/com/kumuluz/ee/logs/cdi/Log.java +++ b/common/src/main/java/com/kumuluz/ee/logs/cdi/Log.java @@ -17,11 +17,12 @@ * out of or in connection with the software or the use or other dealings in the * software. See the License for the specific language governing permissions and * limitations under the License. -*/ + */ package com.kumuluz.ee.logs.cdi; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; + import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; @@ -39,5 +40,6 @@ @Target({ElementType.TYPE, ElementType.METHOD}) public @interface Log { @Nonbinding LogParams[] value() default {}; + @Nonbinding boolean methodCall() default true; } \ No newline at end of file diff --git a/common/src/main/java/com/kumuluz/ee/logs/cdi/interceptors/LogInterceptor.java b/common/src/main/java/com/kumuluz/ee/logs/cdi/interceptors/LogInterceptor.java index 8008524..7b2a510 100644 --- a/common/src/main/java/com/kumuluz/ee/logs/cdi/interceptors/LogInterceptor.java +++ b/common/src/main/java/com/kumuluz/ee/logs/cdi/interceptors/LogInterceptor.java @@ -17,7 +17,7 @@ * out of or in connection with the software or the use or other dealings in the * software. See the License for the specific language governing permissions and * limitations under the License. -*/ + */ package com.kumuluz.ee.logs.cdi.interceptors; import com.kumuluz.ee.logs.LogCommons; @@ -27,11 +27,11 @@ import com.kumuluz.ee.logs.messages.SimpleLogMessage; import com.kumuluz.ee.logs.types.LogMethodContext; import com.kumuluz.ee.logs.types.LogMethodMessage; +import jakarta.annotation.Priority; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; -import javax.annotation.Priority; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; import java.util.Arrays; import java.util.HashMap; diff --git a/fluentd/pom.xml b/fluentd/pom.xml index 5f05f24..4356c6b 100644 --- a/fluentd/pom.xml +++ b/fluentd/pom.xml @@ -5,7 +5,7 @@ kumuluzee-logs com.kumuluz.ee.logs - 1.5.0-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/jul/pom.xml b/jul/pom.xml index 4722b7c..01f7418 100644 --- a/jul/pom.xml +++ b/jul/pom.xml @@ -5,7 +5,7 @@ kumuluzee-logs com.kumuluz.ee.logs - 1.5.0-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/log4j2/pom.xml b/log4j2/pom.xml index 1c2752c..d4c9568 100644 --- a/log4j2/pom.xml +++ b/log4j2/pom.xml @@ -5,7 +5,7 @@ kumuluzee-logs com.kumuluz.ee.logs - 1.5.0-SNAPSHOT + 2.0.0-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 5dc374f..604a0af 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.kumuluz.ee.logs kumuluzee-logs - 1.5.0-SNAPSHOT + 2.0.0-SNAPSHOT common jul @@ -26,22 +26,21 @@ https://ee.kumuluz.com - 1.8 - 1.8 + 21 + 21 UTF-8 + 5.0.0-SNAPSHOT + 1.8.0.Final + 2.0.0-SNAPSHOT - 3.10.0 - 1.6.0.Final - 1.1.0 - - 1.6.8 - 1.6 - 2.3.1 - 2.11.1 - - 2.0.1.Final + 1.6.13 + 3.1.0 + 4.0.1 + 4.0.4 + 2.15.3 + 4.0.1.Final @@ -192,9 +191,15 @@ - javax.xml.bind - jaxb-api - ${jaxb-api.version} + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta-xml-bind-api.version} + + + com.sun.xml.bind + jaxb-impl + ${jaxb-impl.version} + runtime