diff --git a/example/mica-mqtt-example/pom.xml b/example/mica-mqtt-example/pom.xml index 6b4b6635..1483fef2 100644 --- a/example/mica-mqtt-example/pom.xml +++ b/example/mica-mqtt-example/pom.xml @@ -14,7 +14,6 @@ - 2.17.2 22.0.0.2 net.dreamlu.iot.mqtt.server.MqttServerTest net.dreamlu.iot.mqtt.client.MqttClientTest @@ -37,6 +36,10 @@ + + ${project.artifactId} + + jar @@ -50,45 +53,47 @@ caffeine 2.9.2 - + + + org.tinylog + slf4j-tinylog + - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j2.version} + org.tinylog + tinylog-impl org.apache.maven.plugins - maven-dependency-plugin + maven-jar-plugin 3.2.0 - - - copy-dependencies - package - - copy-dependencies - - - target/lib - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 + maven-assembly-plugin + 3.1.1 - true - lib/ ${mainClass.server} + + jar-with-dependencies + + false + + + make-assembly + package + + single + + + diff --git a/example/mica-mqtt-example/src/main/resources/log4j2.properties b/example/mica-mqtt-example/src/main/resources/log4j2.properties deleted file mode 100644 index f2be5310..00000000 --- a/example/mica-mqtt-example/src/main/resources/log4j2.properties +++ /dev/null @@ -1,9 +0,0 @@ -log4j.rootLogger = DEBUG -appender.console.type = Console -appender.console.name = STDOUT -appender.console.layout.type = PatternLayout -appender.console.layout.pattern = %d [%t] %-5p %c{2} - %m%n - -# debug -rootLogger.level = INFO -rootLogger.appenderRef.stdout.ref = STDOUT diff --git a/example/mica-mqtt-example/src/main/resources/tinylog.properties b/example/mica-mqtt-example/src/main/resources/tinylog.properties new file mode 100644 index 00000000..e654301c --- /dev/null +++ b/example/mica-mqtt-example/src/main/resources/tinylog.properties @@ -0,0 +1,8 @@ +writer = console +writer.format = {date: HH:mm:ss.SSS} [{thread}] {level} {class-name}.{method} : {message} +writer.level = info +# level +level@org.tio = warn +level@org.tio.client.TioClient = off +level@org.tio.server = info +level@net.dreamlu = info diff --git a/pom.xml b/pom.xml index 8fd087e3..8dc617e6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ 1.2.83 1.9.0 5.0.1 + 2.4.1 5.8.2 1.18.24 @@ -111,6 +112,23 @@ mica-mqtt-client-spring-boot-starter ${revision} + + + org.tinylog + slf4j-tinylog + ${tinylog.version} + + + org.tinylog + tinylog-impl + ${tinylog.version} + + + org.codehaus.mojo + animal-sniffer-annotations + + + org.junit.jupiter junit-jupiter-engine