diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 726a2395080f..fae1d2451626 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -1,30 +1,31 @@ # To avoid dependency conflicts between SDK and Spring, when modifying or adding dependencies, -# make sure the version is same to sdk/spring/scripts/spring_boot_2.7.18_managed_external_dependencies.txt -# If your version is different from sdk/spring/scripts/spring_boot_2.7.18_managed_external_dependencies.txt, +# make sure the version is same to sdk/spring/scripts/spring_boot_3.3.0_managed_external_dependencies.txt +# If your version is different from sdk/spring/scripts/spring_boot_3.3.0_managed_external_dependencies.txt, # please discuss with Spring Integration team members: # @rujche (rujche), @saragluna (xiada), @yiliuTo (yiliu6), @backwind1233 (zhihaoguo). # Thanks. # Format; # groupId:artifactId;dependency-version -ch.qos.logback:logback-classic;1.3.14 +ch.qos.logback:logback-classic;1.5.6 com.azure.tools:azure-autorest-customization;1.0.0-beta.8 -com.fasterxml.jackson.core:jackson-annotations;2.13.5 -com.fasterxml.jackson.core:jackson-core;2.13.5 -com.fasterxml.jackson.core:jackson-databind;2.13.5 -com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.13.5 -com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.13.5 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.13.5 -com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.13.5 -com.fasterxml.jackson.module:jackson-module-parameter-names;2.13.5 -com.fasterxml.jackson.module:jackson-module-scala_2.12;2.13.5 +com.fasterxml.jackson.core:jackson-annotations;2.17.1 +com.fasterxml.jackson.core:jackson-core;2.17.1 +com.fasterxml.jackson.core:jackson-databind;2.17.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.17.1 +com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.17.1 +com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.17.1 +com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.17.1 +com.fasterxml.jackson.module:jackson-module-parameter-names;2.17.1 +com.fasterxml.jackson.module:jackson-module-scala_2.12;2.17.1 +com.fasterxml.jackson.module:jackson-module-afterburner;2.17.1 com.fasterxml.woodstox:woodstox-core;6.4.0 com.github.spotbugs:spotbugs;4.8.3 com.github.spotbugs:spotbugs-annotations;4.8.3 com.github.spotbugs:spotbugs-maven-plugin;4.8.2.0 com.google.code.gson:gson;2.10.1 com.google.guava:guava;33.1.0-jre -com.h2database:h2;2.2.220 +com.h2database:h2;2.2.224 com.h3xstream.findsecbugs:findsecbugs-plugin;1.9.0 com.knuddels:jtokkit;1.0.0 com.microsoft.azure:applicationinsights-core;3.4.1 @@ -43,21 +44,21 @@ com.microsoft.azure:qpid-proton-j-extensions;1.2.5 com.microsoft.azure.sdk.iot:iot-service-client;1.30.0 com.microsoft.rest:client-runtime;1.7.4 com.microsoft.rest.v2:client-runtime;2.1.1 -com.microsoft.sqlserver:mssql-jdbc;10.2.3.jre8 +com.microsoft.sqlserver:mssql-jdbc;12.6.1.jre11 com.microsoft.azure:spring-data-cosmosdb;2.3.0 com.microsoft.azure:azure-functions-maven-plugin;1.30.0 com.microsoft.azure.functions:azure-functions-java-library;2.2.0 -com.mysql:mysql-connector-j;8.0.33 +com.mysql:mysql-connector-j;8.3.0 com.squareup.okhttp3:mockwebserver;4.12.0 com.squareup.okhttp3:okhttp;4.12.0 -commons-codec:commons-codec;1.15 +commons-codec:commons-codec;1.16.1 commons-net:commons-net;3.9.0 io.cloudevents:cloudevents-api;2.2.0 io.cloudevents:cloudevents-core;2.2.0 io.fabric8:kubernetes-client;6.12.1 -io.micrometer:micrometer-core;1.9.17 -io.micrometer:micrometer-registry-azure-monitor;1.9.17 -io.micrometer:micrometer-registry-graphite;1.9.17 +io.micrometer:micrometer-core;1.13.0 +io.micrometer:micrometer-registry-azure-monitor;1.13.0 +io.micrometer:micrometer-registry-graphite;1.13.0 io.netty:netty-buffer;4.1.110.Final io.netty:netty-common;4.1.110.Final io.netty:netty-codec;4.1.110.Final @@ -71,13 +72,13 @@ io.netty:netty-tcnative-boringssl-static;2.0.65.Final io.netty:netty-transport-native-epoll;4.1.110.Final io.netty:netty-transport-native-unix-common;4.1.110.Final io.netty:netty-transport-native-kqueue;4.1.110.Final -io.projectreactor.netty:reactor-netty;1.0.45 -io.projectreactor.netty:reactor-netty-http;1.0.45 -io.projectreactor:reactor-core;3.4.38 +io.projectreactor.netty:reactor-netty;1.1.19 +io.projectreactor.netty:reactor-netty-http;1.1.19 +io.projectreactor:reactor-core;3.6.6 io.vertx:vertx-codegen;4.5.8 io.vertx:vertx-core;4.5.8 io.vertx:vertx-reactive-streams;4.5.8 -jakarta.validation:jakarta.validation-api;2.0.2 +jakarta.validation:jakarta.validation-api;3.0.2 javax.annotation:javax.annotation-api;1.3.2 javax.json:javax.json-api;1.1.4 javax.servlet:javax.servlet-api;4.0.1 @@ -85,106 +86,105 @@ javax.websocket:javax.websocket-api;1.1 org.apache.commons:commons-compress;1.26.0 org.apache.avro:avro;1.11.3 org.apache.avro:avro-maven-plugin;1.11.3 -org.apache.commons:commons-lang3;3.12.0 -org.apache.groovy:groovy;4.0.15 +org.apache.commons:commons-lang3;3.14.0 +org.apache.groovy:groovy;4.0.21 org.apache.httpcomponents:httpclient;4.5.14 -org.apache.kafka:kafka-clients;3.1.2 -org.apache.logging.log4j:log4j-api;2.17.2 -org.apache.logging.log4j:log4j-core;2.17.2 -org.apache.logging.log4j:log4j-slf4j-impl;2.17.2 +org.apache.kafka:kafka-clients;3.7.0 +org.apache.logging.log4j:log4j-api;2.23.1 +org.apache.logging.log4j:log4j-core;2.23.1 +org.apache.logging.log4j:log4j-slf4j-impl;2.23.1 org.apache.maven:maven-core;3.9.6 org.apache.maven.archetype:archetype-packaging;3.2.1 org.apache.maven.plugins:maven-archetype-plugin;3.2.1 org.apache.maven.plugins:maven-gpg-plugin;3.2.2 org.apache.qpid:proton-j;0.34.1 +org.apache.qpid:qpid-jms-client;2.0.0 org.apache.tinkerpop:gremlin-driver;3.2.4 org.asynchttpclient:async-http-client;2.12.1 org.codehaus.gmavenplus:gmavenplus-plugin;3.0.2 -org.codehaus.groovy:groovy-jsr223;3.0.19 -org.codehaus.janino:janino;3.1.10 +org.codehaus.groovy:groovy-jsr223;4.0.10 +org.codehaus.janino:janino;3.1.12 org.conscrypt:conscrypt-openjdk-uber;2.5.2 org.glassfish.tyrus:tyrus-client;1.16 -org.hibernate.validator:hibernate-validator;6.2.5.Final +org.hibernate.validator:hibernate-validator;8.0.1.Final org.javatuples:javatuples;1.2 org.openjfx:javafx-graphics;17.0.6 org.linguafranca.pwdb:KeePassJava2;2.1.4 org.graalvm.buildtools:junit-platform-native;0.9.19 -org.graalvm.buildtools:native-maven-plugin;0.9.19 +org.graalvm.buildtools:native-maven-plugin;0.10.2 org.graalvm.sdk:graal-sdk;22.0.0.2 org.graalvm.nativeimage:svm;22.0.0.2 -org.messaginghub:pooled-jms;1.2.6 -org.postgresql:postgresql;42.3.9 -org.slf4j:slf4j-api;1.7.36 -org.slf4j:slf4j-nop;1.7.36 -org.slf4j:slf4j-simple;1.7.36 +org.messaginghub:pooled-jms;3.1.6 +org.postgresql:postgresql;42.7.3 +org.slf4j:slf4j-api;2.0.13 +org.slf4j:slf4j-nop;2.0.13 +org.slf4j:slf4j-simple;2.0.13 redis.clients:jedis;5.1.0 io.lettuce:lettuce-core;6.3.2.RELEASE org.redisson:redisson;3.27.2 -net.bytebuddy:byte-buddy;1.12.23 +net.bytebuddy:byte-buddy;1.14.16 +net.bytebuddy:byte-buddy-agent;1.14.16 testdep_net.bytebuddy:byte-buddy;1.14.12 testdep_net.bytebuddy:byte-buddy-agent;1.14.12 ## Spring boot dependency versions -org.springframework.boot:spring-boot-dependencies;2.7.18 -org.springframework.boot:spring-boot-actuator;2.7.18 -org.springframework.boot:spring-boot-actuator-autoconfigure;2.7.18 -org.springframework.boot:spring-boot-autoconfigure-processor;2.7.18 -org.springframework.boot:spring-boot-autoconfigure;2.7.18 -org.springframework.boot:spring-boot-configuration-metadata;2.7.18 -org.springframework.boot:spring-boot-configuration-processor;2.7.18 -org.springframework.boot:spring-boot-maven-plugin;2.7.18 -org.springframework.boot:spring-boot-starter-actuator;2.7.18 -org.springframework.boot:spring-boot-starter-aop;2.7.18 -org.springframework.boot:spring-boot-starter-cache;2.7.18 -org.springframework.boot:spring-boot-starter-data-redis;2.7.18 -org.springframework.boot:spring-boot-starter-data-jdbc;2.7.18 -org.springframework.boot:spring-boot-starter-integration;2.7.18 -org.springframework.boot:spring-boot-starter-logging;2.7.18 -org.springframework.boot:spring-boot-starter-test;2.7.18 -org.springframework.boot:spring-boot-starter-validation;2.7.18 -org.springframework.boot:spring-boot-starter-web;2.7.18 -org.springframework.boot:spring-boot-starter;2.7.18 -org.springframework.boot:spring-boot-test;2.7.18 -org.springframework.boot:spring-boot;2.7.18 -org.springframework.data:spring-data-commons;2.7.18 -org.springframework.data:spring-data-mongodb;3.4.18 -org.springframework.data:spring-data-redis;2.7.18 +org.springframework.boot:spring-boot-dependencies;3.3.0 +org.springframework.boot:spring-boot-actuator;3.3.0 +org.springframework.boot:spring-boot-actuator-autoconfigure;3.3.0 +org.springframework.boot:spring-boot-autoconfigure-processor;3.3.0 +org.springframework.boot:spring-boot-autoconfigure;3.3.0 +org.springframework.boot:spring-boot-configuration-metadata;3.3.0 +org.springframework.boot:spring-boot-configuration-processor;3.3.0 +org.springframework.boot:spring-boot-maven-plugin;3.3.0 +org.springframework.boot:spring-boot-starter-actuator;3.3.0 +org.springframework.boot:spring-boot-starter-aop;3.3.0 +org.springframework.boot:spring-boot-starter-cache;3.3.0 +org.springframework.boot:spring-boot-starter-data-redis;3.3.0 +org.springframework.boot:spring-boot-starter-data-jdbc;3.3.0 +org.springframework.boot:spring-boot-starter-integration;3.3.0 +org.springframework.boot:spring-boot-starter-logging;3.3.0 +org.springframework.boot:spring-boot-starter-test;3.3.0 +org.springframework.boot:spring-boot-starter-validation;3.3.0 +org.springframework.boot:spring-boot-starter-web;3.3.0 +org.springframework.boot:spring-boot-starter;3.3.0 +org.springframework.boot:spring-boot-test;3.3.0 +org.springframework.boot:spring-boot;3.3.0 +org.springframework.data:spring-data-commons;3.3.0 +org.springframework.data:spring-data-mongodb;4.3.0 +org.springframework.data:spring-data-redis;3.3.0 org.springframework.experimental:spring-aot;0.11.4 org.springframework.experimental:spring-aot-maven-plugin;0.11.4 -org.springframework.integration:spring-integration-core;5.5.20 -org.springframework.kafka:spring-kafka;2.9.11 -org.springframework.security:spring-security-config;5.7.11 -org.springframework.security:spring-security-core;5.7.11 -org.springframework.security:spring-security-oauth2-client;5.7.11 -org.springframework.security:spring-security-oauth2-resource-server;5.7.11 -org.springframework.security:spring-security-oauth2-core;5.7.11 -org.springframework.security:spring-security-oauth2-jose;5.7.11 -org.springframework.security:spring-security-web;5.7.11 -org.springframework:spring-beans;5.3.32 -org.springframework:spring-context-support;5.3.32 -org.springframework:spring-context;5.3.32 -org.springframework:spring-core;5.3.32 -org.springframework:spring-expression;5.3.32 -org.springframework:spring-jdbc;5.3.32 -org.springframework:spring-jms;5.3.32 -org.springframework:spring-messaging;5.3.32 -org.springframework:spring-tx;5.3.32 -org.springframework:spring-web;5.3.32 -org.springframework:spring-webmvc;5.3.32 -org.springframework:spring-test;5.3.32 -org.springframework.retry:spring-retry;1.3.4 -org.springframework.boot:spring-boot-starter-parent;2.7.18 +org.springframework.integration:spring-integration-core;6.3.0 +org.springframework.kafka:spring-kafka;3.2.0 +org.springframework.security:spring-security-config;6.3.0 +org.springframework.security:spring-security-core;6.3.0 +org.springframework.security:spring-security-oauth2-client;6.3.0 +org.springframework.security:spring-security-oauth2-resource-server;6.3.0 +org.springframework.security:spring-security-oauth2-core;6.3.0 +org.springframework.security:spring-security-oauth2-jose;6.3.0 +org.springframework.security:spring-security-web;6.3.0 +org.springframework:spring-beans;6.1.8 +org.springframework:spring-context-support;6.1.8 +org.springframework:spring-context;6.1.8 +org.springframework:spring-core;6.1.8 +org.springframework:spring-expression;6.1.8 +org.springframework:spring-jdbc;6.1.8 +org.springframework:spring-jms;6.1.8 +org.springframework:spring-messaging;6.1.8 +org.springframework:spring-tx;6.1.8 +org.springframework:spring-web;6.1.8 +org.springframework:spring-webmvc;6.1.8 +org.springframework:spring-test;6.1.8 +org.springframework.retry:spring-retry;2.0.6 +org.springframework.boot:spring-boot-starter-parent;3.3.0 ## Spring cloud dependency versions -org.springframework.cloud:spring-cloud-dependencies;2021.0.9 -org.springframework.cloud:spring-cloud-starter-bootstrap;3.1.8 -org.springframework.cloud:spring-cloud-bus;3.1.3 -org.springframework.cloud:spring-cloud-context;3.1.8 -org.springframework.cloud:spring-cloud-sleuth-api;3.1.10 -org.springframework.cloud:spring-cloud-starter-sleuth;3.1.10 -org.springframework.cloud:spring-cloud-starter-stream-kafka;3.2.10 -org.springframework.cloud:spring-cloud-stream-binder-test;3.2.10 -org.springframework.cloud:spring-cloud-stream;3.2.10 +org.springframework.cloud:spring-cloud-dependencies;2023.0.1 +org.springframework.cloud:spring-cloud-starter-bootstrap;4.1.2 +org.springframework.cloud:spring-cloud-bus;4.1.1 +org.springframework.cloud:spring-cloud-context;4.1.2 +org.springframework.cloud:spring-cloud-starter-stream-kafka;4.1.1 +org.springframework.cloud:spring-cloud-stream;4.1.1 ## Test dependency versions org.objenesis:objenesis;3.1 @@ -222,13 +222,13 @@ io.opentelemetry.instrumentation:opentelemetry-jdbc;2.4.0-alpha io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;2.4.0-alpha io.opentelemetry.semconv:opentelemetry-semconv-incubating;1.25.0-alpha -io.projectreactor:reactor-test;3.4.38 +io.projectreactor:reactor-test;3.6.6 io.github.hakky54:logcaptor;2.9.0 com.squareup.okio:okio;3.9.0 com.squareup.okio:okio-jvm;3.9.0 junit:junit;4.13.2 commons-cli:commons-cli;1.3 -org.assertj:assertj-core;3.22.0 +org.assertj:assertj-core;3.25.3 org.bouncycastle:bcprov-jdk15to18;1.78.1 org.bouncycastle:bcprov-jdk18on;1.78.1 org.bouncycastle:bcpkix-lts8on;2.73.6 @@ -240,25 +240,25 @@ org.glassfish:jakarta.el;3.0.4 org.hamcrest:hamcrest;2.2 org.hamcrest:hamcrest-all;1.3 org.hamcrest:hamcrest-library;2.2 -org.junit.jupiter:junit-jupiter;5.9.3 -org.junit.jupiter:junit-jupiter-api;5.9.3 -org.junit.jupiter:junit-jupiter-engine;5.9.3 -org.junit.jupiter:junit-jupiter-migrationsupport;5.9.3 -org.junit.jupiter:junit-jupiter-params;5.9.3 -org.junit.platform:junit-platform-commons;1.9.3 -org.junit.platform:junit-platform-console;1.9.3 -org.junit.platform:junit-platform-engine;1.9.3 -org.junit.platform:junit-platform-launcher;1.9.3 -org.junit.platform:junit-platform-reporting;1.9.3 -org.junit.platform:junit-platform-runner;1.9.3 -org.junit.platform:junit-platform-suite-api;1.9.3 -org.junit.platform:junit-platform-testkit;1.9.3 -org.junit.vintage:junit-vintage-engine;5.9.3 +org.junit.jupiter:junit-jupiter;5.10.2 +org.junit.jupiter:junit-jupiter-api;5.10.2 +org.junit.jupiter:junit-jupiter-engine;5.10.2 +org.junit.jupiter:junit-jupiter-migrationsupport;5.10.2 +org.junit.jupiter:junit-jupiter-params;5.10.2 +org.junit.platform:junit-platform-commons;1.10.2 +org.junit.platform:junit-platform-console;1.10.2 +org.junit.platform:junit-platform-engine;1.10.2 +org.junit.platform:junit-platform-launcher;1.10.2 +org.junit.platform:junit-platform-reporting;1.10.2 +org.junit.platform:junit-platform-runner;1.10.2 +org.junit.platform:junit-platform-suite-api;1.10.2 +org.junit.platform:junit-platform-testkit;1.10.2 +org.junit.vintage:junit-vintage-engine;5.10.2 org.openjdk.jmh:jmh-core;1.37 org.openjdk.jmh:jmh-generator-annprocess;1.37 org.spockframework:spock-core;2.4-M4-groovy-4.0 org.testng:testng;7.5.1 -org.awaitility:awaitility;4.2.0 +org.awaitility:awaitility;4.2.1 uk.org.lidalia:slf4j-test;1.2.0 uk.org.webcompere:system-stubs-jupiter;2.0.2 com.google.truth:truth;1.1.3 @@ -277,16 +277,16 @@ com.puppycrawl.tools:checkstyle;9.3 com.toasttab.android:gummy-bears-api-26;0.8.0 commons-io:commons-io;2.11.0 commons-validator:commons-validator;1.6 -io.dropwizard.metrics:metrics-core;4.2.22 -io.dropwizard.metrics:metrics-graphite;4.2.22 -io.dropwizard.metrics:metrics-jvm;4.2.22 +io.dropwizard.metrics:metrics-core;4.2.25 +io.dropwizard.metrics:metrics-graphite;4.2.25 +io.dropwizard.metrics:metrics-jvm;4.2.25 io.reactivex.rxjava2:rxjava;2.2.21 net.java.dev.jna:jna-platform;5.6.0 net.oneandone.reflections8:reflections8;0.11.7 net.jonathangiles.tools:dependencyChecker-maven-plugin;1.0.6 org.apache.commons:commons-collections4;4.4 org.apache.commons:commons-text;1.10.0 -org.apache.commons:commons-dbcp2;2.9.0 +org.apache.commons:commons-dbcp2;2.12.0 org.apache.maven:maven-plugin-api;3.9.6 org.apache.maven:maven-project;2.2.1 org.apache.maven.plugin-tools:maven-plugin-annotations;3.12.0 @@ -299,15 +299,15 @@ org.apache.maven.plugins:maven-eclipse-plugin;2.10 org.apache.maven.plugins:maven-enforcer-plugin;3.4.1 org.apache.maven.plugins:maven-failsafe-plugin;3.2.5 org.apache.maven.plugins:maven-help-plugin;3.4.0 -org.apache.maven.plugins:maven-install-plugin;3.1.1 -org.apache.maven.plugins:maven-jar-plugin;3.3.0 +org.apache.maven.plugins:maven-install-plugin;3.1.2 +org.apache.maven.plugins:maven-jar-plugin;3.4.1 org.apache.maven.plugins:maven-javadoc-plugin;3.6.3 org.apache.maven.plugins:maven-jxr-plugin;3.3.2 org.apache.maven.plugins:maven-plugin-plugin;3.12.0 org.apache.maven.plugins:maven-project-info-reports-plugin;3.5.0 org.apache.maven.plugins:maven-release-plugin;3.0.1 org.apache.maven.plugins:maven-resources-plugin;3.3.1 -org.apache.maven.plugins:maven-shade-plugin;3.5.2 +org.apache.maven.plugins:maven-shade-plugin;3.5.3 org.apache.maven.plugins:maven-site-plugin;3.12.1 org.apache.maven.plugins:maven-source-plugin;3.3.1 org.apache.maven.plugins:maven-surefire-plugin;3.2.5 @@ -333,8 +333,8 @@ org.revapi:revapi-java-spi;0.23.6 org.revapi:revapi-reporter-json;0.4.5 org.revapi:revapi-maven-plugin;0.14.6 org.sonatype.plugins:nexus-staging-maven-plugin;1.6.8 -org.testcontainers:testcontainers;1.17.6 -org.testcontainers:junit-jupiter;1.17.6 +org.testcontainers:testcontainers;1.19.8 +org.testcontainers:junit-jupiter;1.19.8 # External Dependency Exceptions # This section is for external dependencies whose versions were different than @@ -448,3 +448,10 @@ spring_com.microsoft.azure:azure;1.34.0 # sdk\spring\spring-cloud-azure-service\pom.xml spring_redis.clients:jedis;3.8.0 + +# Spring Boot 3 dependency versions +jakarta.servlet:jakarta.servlet-api;6.0.0 +jakarta.xml.bind:jakarta.xml.bind-api;4.0.2 +org.springframework.boot:spring-boot-starter-log4j2;3.3.0 +org.springframework.cloud:spring-cloud-stream-test-binder;4.1.1 +org.springframework:spring-core-test;6.1.8 diff --git a/sdk/core/azure-core-amqp-experimental/pom.xml b/sdk/core/azure-core-amqp-experimental/pom.xml index 0d2b0004bfe2..062d511e5176 100644 --- a/sdk/core/azure-core-amqp-experimental/pom.xml +++ b/sdk/core/azure-core-amqp-experimental/pom.xml @@ -72,25 +72,25 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test io.projectreactor reactor-test - 3.4.38 + 3.6.6 test diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 9441f7d84aa7..2813fba0f522 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -94,26 +94,26 @@ io.projectreactor reactor-test - 3.4.38 + 3.6.6 test org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test diff --git a/sdk/core/azure-core-amqp/spotbugs-exclude.xml b/sdk/core/azure-core-amqp/spotbugs-exclude.xml index 11ba7d2e116a..1f14b303290e 100644 --- a/sdk/core/azure-core-amqp/spotbugs-exclude.xml +++ b/sdk/core/azure-core-amqp/spotbugs-exclude.xml @@ -120,4 +120,15 @@ + + + + + + + + + diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/WindowedSubscriberFluxWindowTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/WindowedSubscriberFluxWindowTest.java index d58ac043aca3..d4812f4947f7 100644 --- a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/WindowedSubscriberFluxWindowTest.java +++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/WindowedSubscriberFluxWindowTest.java @@ -402,7 +402,7 @@ public void shouldCancelWorkOnEmptyWindowTruncation() { StepVerifier.create(windowFlux).verifyComplete(); final WindowedSubscriber.WindowWork work = r.getInnerWork(); - Assertions.assertTrue(work.isCanceled()); + Assertions.assertTrue(work.isCanceled());// reproducer: actual work.isCanceled() is false Assertions.assertFalse(work.hasTimedOut()); } diff --git a/sdk/core/azure-core-experimental/pom.xml b/sdk/core/azure-core-experimental/pom.xml index 6244e75a5d2b..9006a36e1e49 100644 --- a/sdk/core/azure-core-experimental/pom.xml +++ b/sdk/core/azure-core-experimental/pom.xml @@ -86,25 +86,25 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test io.projectreactor reactor-test - 3.4.38 + 3.6.6 test diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index 18cdae641922..2aa11ef9ebca 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -105,26 +105,26 @@ io.projectreactor reactor-test - 3.4.38 + 3.6.6 test org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test @@ -178,7 +178,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.1 true diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index 26cadc69dc5e..d71c0522da80 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -145,7 +145,7 @@ io.projectreactor.netty reactor-netty-http - 1.0.45 + 1.1.19 @@ -177,26 +177,26 @@ io.projectreactor reactor-test - 3.4.38 + 3.6.6 test org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test @@ -212,7 +212,7 @@ io.netty:netty-tcnative-boringssl-static:[2.0.65.Final] - io.projectreactor.netty:reactor-netty-http:[1.0.45] + io.projectreactor.netty:reactor-netty-http:[1.1.19] io.netty:netty-buffer:[4.1.110.Final] io.netty:netty-common:[4.1.110.Final] io.netty:netty-codec:[4.1.110.Final] diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index cc3d5583cd2b..e218cd7f8bc7 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -124,26 +124,26 @@ io.projectreactor reactor-test - 3.4.38 + 3.6.6 test org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test diff --git a/sdk/core/azure-core-http-vertx/pom.xml b/sdk/core/azure-core-http-vertx/pom.xml index e29dd50fb237..70f08f8edbad 100644 --- a/sdk/core/azure-core-http-vertx/pom.xml +++ b/sdk/core/azure-core-http-vertx/pom.xml @@ -120,26 +120,26 @@ io.projectreactor reactor-test - 3.4.38 + 3.6.6 test org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml index e701945d8503..65cf2fcf6cb2 100644 --- a/sdk/core/azure-core-management/pom.xml +++ b/sdk/core/azure-core-management/pom.xml @@ -89,19 +89,19 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test io.projectreactor reactor-test - 3.4.38 + 3.6.6 test diff --git a/sdk/core/azure-core-metrics-opentelemetry/pom.xml b/sdk/core/azure-core-metrics-opentelemetry/pom.xml index e314f0acf746..e1c8c85112d9 100644 --- a/sdk/core/azure-core-metrics-opentelemetry/pom.xml +++ b/sdk/core/azure-core-metrics-opentelemetry/pom.xml @@ -93,13 +93,13 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test @@ -117,7 +117,7 @@ org.assertj assertj-core - 3.22.0 + 3.25.3 test diff --git a/sdk/core/azure-core-perf/pom.xml b/sdk/core/azure-core-perf/pom.xml index 567769925891..1d9ce8fbcc37 100644 --- a/sdk/core/azure-core-perf/pom.xml +++ b/sdk/core/azure-core-perf/pom.xml @@ -45,7 +45,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.13.5 + 2.17.1 com.github.tomakehurst @@ -55,25 +55,25 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test io.projectreactor reactor-test - 3.4.38 + 3.6.6 test @@ -113,7 +113,7 @@ - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.13.5] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.17.1] com.github.tomakehurst:wiremock-jre8-standalone:[2.35.1] diff --git a/sdk/core/azure-core-serializer-avro-apache/pom.xml b/sdk/core/azure-core-serializer-avro-apache/pom.xml index 146c5a6d00f1..96a517fe93da 100644 --- a/sdk/core/azure-core-serializer-avro-apache/pom.xml +++ b/sdk/core/azure-core-serializer-avro-apache/pom.xml @@ -95,25 +95,25 @@ io.projectreactor reactor-test - 3.4.38 + 3.6.6 test org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test diff --git a/sdk/core/azure-core-serializer-avro-jackson/pom.xml b/sdk/core/azure-core-serializer-avro-jackson/pom.xml index a22690533295..1c57dadcf36b 100644 --- a/sdk/core/azure-core-serializer-avro-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-avro-jackson/pom.xml @@ -81,31 +81,31 @@ com.fasterxml.jackson.dataformat jackson-dataformat-avro - 2.13.5 + 2.17.1 io.projectreactor reactor-test - 3.4.38 + 3.6.6 test org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test @@ -120,7 +120,7 @@ - com.fasterxml.jackson.dataformat:jackson-dataformat-avro:[2.13.5] + com.fasterxml.jackson.dataformat:jackson-dataformat-avro:[2.17.1] diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml index ce1c82adeead..5123f653dfdd 100644 --- a/sdk/core/azure-core-serializer-json-gson/pom.xml +++ b/sdk/core/azure-core-serializer-json-gson/pom.xml @@ -104,25 +104,25 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test io.projectreactor reactor-test - 3.4.38 + 3.6.6 test diff --git a/sdk/core/azure-core-serializer-json-jackson/pom.xml b/sdk/core/azure-core-serializer-json-jackson/pom.xml index 4c6aed4557a7..5fec0d2a21ff 100644 --- a/sdk/core/azure-core-serializer-json-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-json-jackson/pom.xml @@ -97,28 +97,28 @@ com.fasterxml.jackson.core jackson-annotations - 2.13.5 + 2.17.1 com.fasterxml.jackson.core jackson-core - 2.13.5 + 2.17.1 com.fasterxml.jackson.core jackson-databind - 2.13.5 + 2.17.1 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.13.5 + 2.17.1 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.13.5 + 2.17.1 test @@ -133,25 +133,25 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test io.projectreactor reactor-test - 3.4.38 + 3.6.6 test @@ -166,11 +166,11 @@ - com.fasterxml.jackson.core:jackson-annotations:[2.13.5] - com.fasterxml.jackson.core:jackson-core:[2.13.5] - com.fasterxml.jackson.core:jackson-databind:[2.13.5] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.13.5] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.13.5] + com.fasterxml.jackson.core:jackson-annotations:[2.17.1] + com.fasterxml.jackson.core:jackson-core:[2.17.1] + com.fasterxml.jackson.core:jackson-databind:[2.17.1] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.17.1] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.17.1] diff --git a/sdk/core/azure-core-serializer-json-jackson/spotbugs-exclude.xml b/sdk/core/azure-core-serializer-json-jackson/spotbugs-exclude.xml index c95fcfd6b2a8..0dcb558718ca 100644 --- a/sdk/core/azure-core-serializer-json-jackson/spotbugs-exclude.xml +++ b/sdk/core/azure-core-serializer-json-jackson/spotbugs-exclude.xml @@ -51,4 +51,15 @@ + + + + + + + + + diff --git a/sdk/core/azure-core-serializer-json-jackson/src/test/java/com/azure/core/serializer/json/jackson/JacksonJsonSerializerTests.java b/sdk/core/azure-core-serializer-json-jackson/src/test/java/com/azure/core/serializer/json/jackson/JacksonJsonSerializerTests.java index 7f38ae7bb8b1..d9485b62bc70 100644 --- a/sdk/core/azure-core-serializer-json-jackson/src/test/java/com/azure/core/serializer/json/jackson/JacksonJsonSerializerTests.java +++ b/sdk/core/azure-core-serializer-json-jackson/src/test/java/com/azure/core/serializer/json/jackson/JacksonJsonSerializerTests.java @@ -133,6 +133,7 @@ public void serialize(Person person, JsonGenerator generator, SerializerProvider private static final class PersonDeserializer extends JsonDeserializer { + @SuppressWarnings("deprecation") @Override public Person deserialize(JsonParser parser, DeserializationContext context) throws IOException { String name = "John Doe"; diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index eee204939577..7fc42a2c9635 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -78,19 +78,19 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.13.5 + 2.17.1 io.projectreactor reactor-test - 3.4.38 + 3.6.6 io.projectreactor.netty reactor-netty-http - 1.0.45 + 1.1.19 org.apache.commons @@ -112,19 +112,19 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test @@ -135,7 +135,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.1 test-jar @@ -155,12 +155,12 @@ - io.projectreactor:reactor-test:[3.4.38] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.13.5] - io.projectreactor.netty:reactor-netty-http:[1.0.45] + io.projectreactor:reactor-test:[3.6.6] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.17.1] + io.projectreactor.netty:reactor-netty-http:[1.1.19] - org.junit.jupiter:junit-jupiter-api:[5.9.3] - org.junit.jupiter:junit-jupiter-params:[5.9.3] + org.junit.jupiter:junit-jupiter-api:[5.10.2] + org.junit.jupiter:junit-jupiter-params:[5.10.2] org.apache.commons:commons-compress:[1.26.0] org.eclipse.jetty:jetty-server:[9.4.54.v20240208] org.eclipse.jetty:jetty-servlet:[9.4.54.v20240208] diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index 0528362353fe..38af4c5f0460 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -104,13 +104,13 @@ org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test diff --git a/sdk/core/azure-core-version-tests/pom.xml b/sdk/core/azure-core-version-tests/pom.xml index 48a46191dc77..f7bbeed362cf 100644 --- a/sdk/core/azure-core-version-tests/pom.xml +++ b/sdk/core/azure-core-version-tests/pom.xml @@ -72,32 +72,32 @@ com.fasterxml.jackson.core jackson-annotations - 2.13.5 + 2.17.1 com.fasterxml.jackson.core jackson-core - 2.13.5 + 2.17.1 com.fasterxml.jackson.core jackson-databind - 2.13.5 + 2.17.1 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.13.5 + 2.17.1 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.13.5 + 2.17.1 io.projectreactor reactor-core - 3.4.38 + 3.6.6 + 3.6.6 test org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test @@ -151,13 +151,13 @@ - io.projectreactor:reactor-core:[3.4.38] - com.fasterxml.jackson.core:jackson-annotations:[2.13.5] - com.fasterxml.jackson.core:jackson-core:[2.13.5] - com.fasterxml.jackson.core:jackson-databind:[2.13.5] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.13.5] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.13.5] - org.slf4j:slf4j-api:[1.7.36] + io.projectreactor:reactor-core:[3.6.6] + com.fasterxml.jackson.core:jackson-annotations:[2.17.1] + com.fasterxml.jackson.core:jackson-core:[2.17.1] + com.fasterxml.jackson.core:jackson-databind:[2.17.1] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.17.1] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.17.1] + org.slf4j:slf4j-api:[2.0.13] diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index 380dd724b504..761547820137 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -114,27 +114,27 @@ com.fasterxml.jackson.core jackson-annotations - 2.13.5 + 2.17.1 com.fasterxml.jackson.core jackson-core - 2.13.5 + 2.17.1 com.fasterxml.jackson.core jackson-databind - 2.13.5 + 2.17.1 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.13.5 + 2.17.1 org.slf4j slf4j-api - 1.7.36 + 2.0.13 + 3.6.6 @@ -163,32 +163,32 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.13.5 + 2.17.1 test io.projectreactor reactor-test - 3.4.38 + 3.6.6 test org.junit.jupiter junit-jupiter-api - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.2 test org.junit.jupiter junit-jupiter-params - 5.9.3 + 5.10.2 test @@ -223,7 +223,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.1 test-jar @@ -243,13 +243,13 @@ - io.projectreactor:reactor-core:[3.4.38] - com.fasterxml.jackson.core:jackson-annotations:[2.13.5] - com.fasterxml.jackson.core:jackson-core:[2.13.5] - com.fasterxml.jackson.core:jackson-databind:[2.13.5] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.13.5] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.13.5] - org.slf4j:slf4j-api:[1.7.36] + io.projectreactor:reactor-core:[3.6.6] + com.fasterxml.jackson.core:jackson-annotations:[2.17.1] + com.fasterxml.jackson.core:jackson-core:[2.17.1] + com.fasterxml.jackson.core:jackson-databind:[2.17.1] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.17.1] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.17.1] + org.slf4j:slf4j-api:[2.0.13] diff --git a/sdk/core/azure-core/spotbugs-exclude.xml b/sdk/core/azure-core/spotbugs-exclude.xml index 2ffee6a08a69..546c1eb0384e 100644 --- a/sdk/core/azure-core/spotbugs-exclude.xml +++ b/sdk/core/azure-core/spotbugs-exclude.xml @@ -455,4 +455,14 @@ + + + + + + + + diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/implementation/logging/DefaultLogger.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/logging/DefaultLogger.java index 3cc0e874e1c1..6c11346e474e 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/implementation/logging/DefaultLogger.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/logging/DefaultLogger.java @@ -7,7 +7,6 @@ import com.azure.core.util.Configuration; import com.azure.core.util.logging.LogLevel; import org.slf4j.helpers.FormattingTuple; -import org.slf4j.helpers.MarkerIgnoringBase; import org.slf4j.helpers.MessageFormatter; import java.io.PrintStream; diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/implementation/logging/MarkerIgnoringBase.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/logging/MarkerIgnoringBase.java new file mode 100644 index 000000000000..8702d4676a4c --- /dev/null +++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/logging/MarkerIgnoringBase.java @@ -0,0 +1,173 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +package com.azure.core.implementation.logging; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Marker; + +import java.io.ObjectStreamException; +import java.io.Serializable; + +/** + * This class serves as base for adapters or native implementations of logging systems + * lacking Marker support. In this implementation, methods taking marker data + * simply invoke the corresponding method without the Marker argument, discarding + * any marker data passed as argument. + */ +public abstract class MarkerIgnoringBase implements Serializable, Logger { + + private static final long serialVersionUID = 9044267456635152283L; + + protected String name; + + public String getName() { + return name; + } + + /** + * Replace this instance with a homonymous (same name) logger returned + * by LoggerFactory. Note that this method is only called during + * deserialization. + * + *

+ * This approach will work well if the desired ILoggerFactory is the one + * referenced by LoggerFactory. However, if the user manages its logger hierarchy + * through a different (non-static) mechanism, e.g. dependency injection, then + * this approach would be mostly counterproductive. + * + * @return logger with same name as returned by LoggerFactory + * @throws ObjectStreamException + */ + protected Object readResolve() throws ObjectStreamException { + // using getName() instead of this.name works even for + // NOPLogger + return LoggerFactory.getLogger(getName()); + } + + public boolean isTraceEnabled(Marker marker) { + return isTraceEnabled(); + } + + public void trace(Marker marker, String msg) { + trace(msg); + } + + public void trace(Marker marker, String format, Object arg) { + trace(format, arg); + } + + public void trace(Marker marker, String format, Object arg1, Object arg2) { + trace(format, arg1, arg2); + } + + public void trace(Marker marker, String format, Object... arguments) { + trace(format, arguments); + } + + public void trace(Marker marker, String msg, Throwable t) { + trace(msg, t); + } + + public boolean isDebugEnabled(Marker marker) { + return isDebugEnabled(); + } + + public void debug(Marker marker, String msg) { + debug(msg); + } + + public void debug(Marker marker, String format, Object arg) { + debug(format, arg); + } + + public void debug(Marker marker, String format, Object arg1, Object arg2) { + debug(format, arg1, arg2); + } + + public void debug(Marker marker, String format, Object... arguments) { + debug(format, arguments); + } + + public void debug(Marker marker, String msg, Throwable t) { + debug(msg, t); + } + + public boolean isInfoEnabled(Marker marker) { + return isInfoEnabled(); + } + + public void info(Marker marker, String msg) { + info(msg); + } + + public void info(Marker marker, String format, Object arg) { + info(format, arg); + } + + public void info(Marker marker, String format, Object arg1, Object arg2) { + info(format, arg1, arg2); + } + + public void info(Marker marker, String format, Object... arguments) { + info(format, arguments); + } + + public void info(Marker marker, String msg, Throwable t) { + info(msg, t); + } + + public boolean isWarnEnabled(Marker marker) { + return isWarnEnabled(); + } + + public void warn(Marker marker, String msg) { + warn(msg); + } + + public void warn(Marker marker, String format, Object arg) { + warn(format, arg); + } + + public void warn(Marker marker, String format, Object arg1, Object arg2) { + warn(format, arg1, arg2); + } + + public void warn(Marker marker, String format, Object... arguments) { + warn(format, arguments); + } + + public void warn(Marker marker, String msg, Throwable t) { + warn(msg, t); + } + + public boolean isErrorEnabled(Marker marker) { + return isErrorEnabled(); + } + + public void error(Marker marker, String msg) { + error(msg); + } + + public void error(Marker marker, String format, Object arg) { + error(format, arg); + } + + public void error(Marker marker, String format, Object arg1, Object arg2) { + error(format, arg1, arg2); + } + + public void error(Marker marker, String format, Object... arguments) { + error(format, arguments); + } + + public void error(Marker marker, String msg, Throwable t) { + error(msg, t); + } + + public String toString() { + return this.getClass().getName() + "(" + getName() + ")"; + } + +}