diff --git a/boot/pom.xml b/boot/pom.xml index 7739f3c7..19640cd6 100644 --- a/boot/pom.xml +++ b/boot/pom.xml @@ -10,7 +10,6 @@ jar - 3.0 @@ -24,83 +23,55 @@ 3.0 3.0 - - + 5.3.19 - 2.4.3 + 2.6.7 + 4.12 - - - 1.15 - 2.8.0 - 4.4 - 3.12.0 - 1.4 - 1.2 - 2.14.0 - 4.5.13 - 4.4.14 - 30.1-jre - 3.9.1 - 2.8.6 - 2.4.13 - 5.0.3 - 2.8.8 - 3.2.0 - 5.5.9 - 5.7.0 - 1.28 - - - - 2.12.1 - 1.2.51 - - 4.1.2 - 1.9.0 - 3.27.0-GA - 1.10.22 - + 3.29.2-GA + 1.12.18 + + 2.13.2 - 4.1.63.Final + 4.1.84.Final + 2.4.17 + 5.3.0 - 3.6.1 - 5.1.0 + 5.3.0 + + + 6.0.0 - 4.2.1 - 3.3.0 - + 4.7.2 + 2.8.8 4.5.2 + + 5.2.3 + 1.9.0 + + + 4.0.1 + - 7.9.3 - 4.1.5 - 8.6.2 - - - 1.7.30 - 1.2.3 - - 4.12 + 8.4.3 11 UTF-8 - 1.3.5 - 3.1.0 - 3.8.1 - 3.2.0 - 3.0.0-M5 - 3.2.0 - 3.2.4 - 2.8.1 - + 3.2.0 + 3.3.0 + 3.10.1 + 3.0.0-M7 + 3.3.0 + 3.4.0 + 2.12.0 ${file.encoding} ${file.encoding} @@ -111,7 +82,13 @@ org.springframework.boot spring-boot-autoconfigure ${spring.boot.version} - compile + provided + + + org.springframework.boot + spring-boot-starter-logging + ${spring.boot.version} + provided @@ -156,31 +133,6 @@ ${zfoo.monitor.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - ch.qos.logback - logback-core - ${logback.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - slf4j-api - org.slf4j - - - - junit @@ -262,5 +214,4 @@ - diff --git a/event/pom.xml b/event/pom.xml index a8025dc7..d15617d9 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -10,7 +10,6 @@ jar - 3.0 @@ -24,83 +23,55 @@ 3.0 3.0 + + 5.3.19 + 2.6.7 + 4.12 - - 5.3.17 - 2.4.3 - - - - 1.15 - 2.8.0 - 4.4 - 3.12.0 - 1.4 - 1.2 - 2.14.0 - 4.5.13 - 4.4.14 - 30.1-jre - 3.9.1 - 2.8.6 - 2.4.13 - 5.0.3 - 2.8.8 - 3.2.0 - 5.5.9 - 5.7.0 - 1.28 - - - - 2.12.1 - 1.2.51 - - 4.1.2 - 1.9.0 - 3.27.0-GA - 1.10.22 - + 3.29.2-GA + 1.12.18 + + 2.13.2 - 4.1.63.Final + 4.1.84.Final + 2.4.17 + 5.3.0 - 3.6.1 - 5.1.0 + 5.3.0 + + + 6.0.0 - 4.2.1 - 3.3.0 - + 4.7.2 + 2.8.8 4.5.2 + + 5.2.3 + 1.9.0 + + + 4.0.1 + - 7.9.3 - 4.1.5 - 8.6.2 - - - 1.7.30 - 1.2.3 - - 4.12 + 8.4.3 11 UTF-8 - 1.3.5 - 3.1.0 - 3.8.1 - 3.2.0 - 3.0.0-M5 - 3.2.0 - 3.2.4 - 2.8.1 - + 3.2.0 + 3.3.0 + 3.10.1 + 3.0.0-M7 + 3.3.0 + 3.4.0 + 2.12.0 ${file.encoding} ${file.encoding} @@ -114,12 +85,6 @@ ${zfoo.util.version} - - io.netty - netty-all - ${netty.version} - - org.javassist @@ -134,31 +99,12 @@ ${spring.version} - - org.slf4j - slf4j-api - ${slf4j.version} + org.springframework.boot + spring-boot-starter-logging + ${spring.boot.version} + provided - - - ch.qos.logback - logback-core - ${logback.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - slf4j-api - org.slf4j - - - - junit @@ -166,7 +112,6 @@ ${junit.version} test - diff --git a/hotswap/pom.xml b/hotswap/pom.xml index 87364f3a..86c08d7c 100644 --- a/hotswap/pom.xml +++ b/hotswap/pom.xml @@ -23,89 +23,60 @@ 3.0 3.0 + + 5.3.19 + 2.6.7 + 4.12 - - 5.3.17 - 2.4.3 - - - - 1.15 - 2.8.0 - 4.4 - 3.12.0 - 1.4 - 1.2 - 2.14.0 - 4.5.13 - 4.4.14 - 30.1-jre - 3.9.1 - 2.8.6 - 2.4.13 - 5.0.3 - 2.8.8 - 3.2.0 - 5.5.9 - 5.7.0 - 1.28 - - - - 2.12.1 - 1.2.51 - - 4.1.2 - 1.9.0 - 3.27.0-GA - 1.10.22 - + 3.29.2-GA + 1.12.18 + + 2.13.2 - 4.1.63.Final + 4.1.84.Final + 2.4.17 + 5.3.0 - 3.6.1 - 5.1.0 + 5.3.0 + + + 6.0.0 - 4.2.1 - 3.3.0 - + 4.7.2 + 2.8.8 4.5.2 + + 5.2.3 + 1.9.0 + + + 4.0.1 + - 7.9.3 - 4.1.5 - 8.6.2 - - - 1.7.30 - 1.2.3 - - 4.12 + 8.4.3 11 UTF-8 - 1.3.5 - 3.1.0 - 3.8.1 - 3.2.0 - 3.0.0-M5 - 3.2.0 - 3.2.4 - 2.8.1 - + 3.2.0 + 3.3.0 + 3.10.1 + 3.0.0-M7 + 3.3.0 + 3.4.0 + 2.12.0 ${file.encoding} ${file.encoding} - @@ -139,32 +110,12 @@ ${bytebuddy.version} - - - org.slf4j - slf4j-api - ${slf4j.version} + org.springframework.boot + spring-boot-starter-logging + ${spring.boot.version} + provided - - - ch.qos.logback - logback-core - ${logback.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - slf4j-api - org.slf4j - - - - junit junit diff --git a/monitor/pom.xml b/monitor/pom.xml index c4c222f2..026327e2 100644 --- a/monitor/pom.xml +++ b/monitor/pom.xml @@ -23,82 +23,55 @@ 3.0 3.0 - + 5.3.19 - 2.4.3 + 2.6.7 + 4.12 - - - 1.15 - 2.8.0 - 4.4 - 3.12.0 - 1.4 - 1.2 - 2.14.0 - 4.5.13 - 4.4.14 - 30.1-jre - 3.9.1 - 2.8.6 - 2.4.13 - 5.0.3 - 2.8.8 - 3.2.0 - 5.5.9 - 5.7.0 - 1.28 - - - - 2.12.1 - 1.2.51 - - 4.1.2 - 1.9.0 - 3.27.0-GA - 1.10.22 - + 3.29.2-GA + 1.12.18 + + 2.13.2 - 4.1.63.Final + 4.1.84.Final + 2.4.17 + 5.3.0 - 3.6.1 - 5.1.0 + 5.3.0 + + + 6.0.0 - 4.2.1 - 3.3.0 - + 4.7.2 + 2.8.8 4.5.2 + + 5.2.3 + 1.9.0 + + + 4.0.1 + - 7.9.3 - 4.1.5 - 8.6.2 - - - 1.7.30 - 1.2.3 - - 4.12 + 8.4.3 11 UTF-8 - 1.3.5 - 3.1.0 - 3.8.1 - 3.2.0 - 3.0.0-M5 - 3.2.0 - 3.2.4 - 2.8.1 - + 3.2.0 + 3.3.0 + 3.10.1 + 3.0.0-M7 + 3.3.0 + 3.4.0 + 2.12.0 ${file.encoding} ${file.encoding} @@ -117,31 +90,6 @@ com.github.oshi oshi-core ${oshi.version} - - - - com.zfoo - scheduler - ${zfoo.scheduler.version} - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - ch.qos.logback - logback-core - ${logback.version} - - - - ch.qos.logback - logback-classic - ${logback.version} slf4j-api @@ -150,6 +98,18 @@ + + com.zfoo + scheduler + ${zfoo.scheduler.version} + + + + org.springframework.boot + spring-boot-starter-logging + ${spring.boot.version} + provided + junit diff --git a/net/pom.xml b/net/pom.xml index f78f259f..5ae4560d 100644 --- a/net/pom.xml +++ b/net/pom.xml @@ -10,7 +10,6 @@ jar - 3.0 @@ -24,83 +23,55 @@ 3.0 3.0 + + 5.3.19 + 2.6.7 + 4.12 - - 5.3.17 - 2.4.3 - - - - 1.15 - 2.8.0 - 4.4 - 3.12.0 - 1.4 - 1.2 - 2.14.0 - 4.5.13 - 4.4.14 - 30.1-jre - 3.9.1 - 2.8.6 - 2.4.13 - 5.0.3 - 2.8.8 - 3.2.0 - 5.5.9 - 5.7.0 - 1.28 - - - - 2.12.1 - 1.2.51 - - 4.1.2 - 1.9.0 - 3.27.0-GA - 1.10.22 - + 3.29.2-GA + 1.12.18 + + 2.13.2 - 4.1.63.Final + 4.1.84.Final + 2.4.17 + 5.3.0 - 3.6.1 - 5.1.0 + 5.3.0 + + + 6.0.0 - 4.2.1 - 3.3.0 - + 4.7.2 + 2.8.8 4.5.2 + + 5.2.3 + 1.9.0 + + + 4.0.1 + - 7.9.3 - 4.1.5 - 8.6.2 - - - 1.7.30 - 1.2.3 - - 4.12 + 8.4.3 11 UTF-8 - 1.3.5 - 3.1.0 - 3.8.1 - 3.2.0 - 3.0.0-M5 - 3.2.0 - 3.2.4 - 2.8.1 - + 3.2.0 + 3.3.0 + 3.10.1 + 3.0.0-M7 + 3.3.0 + 3.4.0 + 2.12.0 ${file.encoding} ${file.encoding} @@ -142,71 +113,26 @@ ${javassist.version} - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - io.netty - netty-all - - - io.netty - netty-handler - - - io.netty - netty-transport-native-epoll - - - slf4j-api - org.slf4j - - - slf4j-log4j12 - org.slf4j - - - log4j - log4j - - - commons-lang - commons-lang - - - - - - - - org.apache.curator - curator-framework - ${curator.version} - - - com.google.guava - guava - - - zookeeper - org.apache.zookeeper - - - slf4j-api - org.slf4j - - - - org.apache.curator curator-recipes ${curator.version} + + + netty-transport-native-epoll + io.netty + + + netty-handler + io.netty + + + guava + com.google.guava + + @@ -223,31 +149,12 @@ ${spring.version} - - org.slf4j - slf4j-api - ${slf4j.version} + org.springframework.boot + spring-boot-starter-logging + ${spring.boot.version} + provided - - - ch.qos.logback - logback-core - ${logback.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - slf4j-api - org.slf4j - - - - junit diff --git a/orm/pom.xml b/orm/pom.xml index 61dcdf86..4641af7a 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -23,90 +23,61 @@ 3.0 3.0 - - + 5.3.19 - 2.4.3 + 2.6.7 + 4.12 - - - 1.15 - 2.8.0 - 4.4 - 3.12.0 - 1.4 - 1.2 - 2.14.0 - 4.5.13 - 4.4.14 - 30.1-jre - 3.9.1 - 2.8.6 - 2.4.13 - 5.0.3 - 2.8.8 - 3.2.0 - 5.5.9 - 5.7.0 - 1.28 - - - - 2.12.1 - 1.2.51 - - 4.1.2 - 1.9.0 - 3.27.0-GA - 1.10.22 - + 3.29.2-GA + 1.12.18 + + 2.13.2 - 4.1.63.Final + 4.1.84.Final + 2.4.17 + 5.3.0 - 3.6.1 - 5.1.0 + 5.3.0 + + + 6.0.0 - 4.2.1 - 3.3.0 - + 4.7.2 + 2.8.8 4.5.2 + + 5.2.3 + 1.9.0 + + + 4.0.1 + - 7.9.3 - 4.1.5 - 8.6.2 - - - 1.7.30 - 1.2.3 - - 4.12 + 8.4.3 11 UTF-8 - 1.3.5 - 3.1.0 - 3.8.1 - 3.2.0 - 3.0.0-M5 - 3.2.0 - 3.2.4 - 2.8.1 - + 3.2.0 + 3.3.0 + 3.10.1 + 3.0.0-M7 + 3.3.0 + 3.4.0 + 2.12.0 ${file.encoding} ${file.encoding} - com.zfoo @@ -132,23 +103,6 @@ ${mongodb-driver-sync.version} - - - com.google.guava - guava - ${google.guava.version} - - - error_prone_annotations - com.google.errorprone - - - checker-qual - org.checkerframework - - - - com.github.ben-manes.caffeine @@ -170,31 +124,12 @@ ${spring.version} - - org.slf4j - slf4j-api - ${slf4j.version} + org.springframework.boot + spring-boot-starter-logging + ${spring.boot.version} + provided - - - ch.qos.logback - logback-core - ${logback.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - slf4j-api - org.slf4j - - - - junit diff --git a/orm/src/test/java/com/zfoo/orm/cache/guava/GuavaCacheTest.java b/orm/src/test/java/com/zfoo/orm/cache/guava/GuavaCacheTest.java deleted file mode 100644 index bfcfe590..00000000 --- a/orm/src/test/java/com/zfoo/orm/cache/guava/GuavaCacheTest.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) 2020 The zfoo Authors - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and limitations under the License. - * - */ - -package com.zfoo.orm.cache.guava; - -import com.google.common.cache.*; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; -import com.zfoo.util.ThreadUtils; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - -import java.util.concurrent.TimeUnit; - -/** - * @author godotg - * @version 1.0 - * @since 2019-08-13 11:15 - */ -@Ignore -public class GuavaCacheTest { - - @Test - public void sizeRemovedTest() { - RemovalListener listener = new RemovalListener() { - public void onRemoval(RemovalNotification notification) { - System.out.println("[" + notification.getKey() + ":" + notification.getValue() + "] is removed!"); - - // 采用LRU算法,所以最后会移除key1 - Assert.assertEquals(notification.getKey(), "key1"); - Assert.assertEquals(notification.getValue(), "value1"); - } - }; - Cache cache = CacheBuilder.newBuilder() - .maximumSize(3) - .removalListener(listener) - .build(); - cache.put("key1", "value1"); - cache.put("key2", "value2"); - cache.put("key3", "value3"); - cache.put("key4", "value4"); - } - - @Test - public void timeRemovedTest() { - // 基于过期时间的策略不会回调这个remove方法 - Cache cache = CacheBuilder.newBuilder() - .expireAfterAccess(10, TimeUnit.SECONDS) - .refreshAfterWrite(5, TimeUnit.SECONDS) - .removalListener(new RemovalListener() { - public void onRemoval(RemovalNotification notification) { - System.out.println("[" + notification.getKey() + ":" + notification.getValue() + "] is removed!"); - } - }) - .build(new CacheLoader() { - public String load(String key) { - System.out.println("load by " + Thread.currentThread().getName()); - return "newValue"; - } - - @Override - public ListenableFuture reload(String key, String oldValue) { - System.out.println("reload by " + Thread.currentThread().getName()); - return Futures.immediateFuture("newValue"); - } - }); - - cache.put("key1", "value1"); - - Assert.assertEquals(cache.getIfPresent("key1"), "value1"); - ThreadUtils.sleep(5000); - Assert.assertEquals(cache.getIfPresent("key1"), "newValue"); - } - - -} diff --git a/pom.xml b/pom.xml index 305941da..6eee3a5b 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,6 @@ util - 3.0 @@ -50,94 +49,60 @@ 3.0 3.0 - - + 5.3.19 - 2.4.3 + 2.6.7 + 4.12 - - - 1.15 - 2.8.0 - 4.4 - 3.12.0 - 1.4 - 1.2 - 2.14.0 - 4.5.13 - 4.4.14 - 30.1-jre - 3.9.1 - 2.8.6 - 2.4.13 - 5.0.3 - 2.8.8 - 3.2.0 - 5.5.9 - 5.7.0 - 1.28 - - - - 2.12.1 - 1.2.51 - - 4.1.2 - 1.9.0 - 3.27.0-GA - 1.10.22 - + 3.29.2-GA + 1.12.18 + + 2.13.2 - 4.1.63.Final + 4.1.84.Final + 2.4.17 + 5.3.0 - 3.6.1 - 5.1.0 + 5.3.0 + + + 6.0.0 - 4.2.1 - 3.3.0 - + 4.7.2 + 2.8.8 4.5.2 + + 5.2.3 + 1.9.0 + + + 4.0.1 + - 7.9.3 - 4.1.5 - 8.6.2 - - - 1.7.30 - 1.2.3 - - 4.12 + 8.4.3 11 UTF-8 - 1.3.5 - 3.1.0 - 3.8.1 - 3.2.0 - 3.0.0-M5 - 3.2.0 - 3.2.4 - 2.8.1 - + 3.2.0 + 3.3.0 + 3.10.1 + 3.0.0-M7 + 3.3.0 + 3.4.0 + 2.12.0 ${file.encoding} ${file.encoding} - - - - - - src/main/java diff --git a/protocol/pom.xml b/protocol/pom.xml index 99954cba..cb632c0d 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -10,7 +10,6 @@ jar - 3.0 @@ -24,83 +23,55 @@ 3.0 3.0 + + 5.3.19 + 2.6.7 + 4.12 - - 5.3.17 - 2.4.3 - - - - 1.15 - 2.8.0 - 4.4 - 3.12.0 - 1.4 - 1.2 - 2.14.0 - 4.5.13 - 4.4.14 - 30.1-jre - 3.9.1 - 2.8.6 - 2.4.13 - 5.0.3 - 2.8.8 - 3.2.0 - 5.5.9 - 5.7.0 - 1.28 - - - - 2.12.1 - 1.2.51 - - 4.1.2 - 1.9.0 - 3.27.0-GA - 1.10.22 - + 3.29.2-GA + 1.12.18 + + 2.13.2 - 4.1.63.Final + 4.1.84.Final + 2.4.17 + 5.3.0 - 3.6.1 - 5.1.0 + 5.3.0 + + + 6.0.0 - 4.2.1 - 3.3.0 - + 4.7.2 + 2.8.8 4.5.2 + + 5.2.3 + 1.9.0 + + + 4.0.1 + - 7.9.3 - 4.1.5 - 8.6.2 - - - 1.7.30 - 1.2.3 - - 4.12 + 8.4.3 11 UTF-8 - 1.3.5 - 3.1.0 - 3.8.1 - 3.2.0 - 3.0.0-M5 - 3.2.0 - 3.2.4 - 2.8.1 - + 3.2.0 + 3.3.0 + 3.10.1 + 3.0.0-M7 + 3.3.0 + 3.4.0 + 2.12.0 ${file.encoding} ${file.encoding} @@ -110,7 +81,7 @@ io.netty - netty-all + netty-buffer ${netty.version} @@ -165,23 +136,6 @@ - - com.google.guava - guava - ${google.guava.version} - - - error_prone_annotations - com.google.errorprone - - - checker-qual - org.checkerframework - - - test - - @@ -191,31 +145,12 @@ test - - org.slf4j - slf4j-api - ${slf4j.version} + org.springframework.boot + spring-boot-starter-logging + ${spring.boot.version} + provided - - - ch.qos.logback - logback-core - ${logback.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - slf4j-api - org.slf4j - - - - junit diff --git a/scheduler/pom.xml b/scheduler/pom.xml index 490b1f28..5f924e39 100644 --- a/scheduler/pom.xml +++ b/scheduler/pom.xml @@ -10,7 +10,6 @@ jar - 3.0 @@ -24,89 +23,60 @@ 3.0 3.0 + + 5.3.19 + 2.6.7 + 4.12 - - 5.3.17 - 2.4.3 - - - - 1.15 - 2.8.0 - 4.4 - 3.12.0 - 1.4 - 1.2 - 2.14.0 - 4.5.13 - 4.4.14 - 30.1-jre - 3.9.1 - 2.8.6 - 2.4.13 - 5.0.3 - 2.8.8 - 3.2.0 - 5.5.9 - 5.7.0 - 1.28 - - - - 2.12.1 - 1.2.51 - - 4.1.2 - 1.9.0 - 3.27.0-GA - 1.10.22 - + 3.29.2-GA + 1.12.18 + + 2.13.2 - 4.1.63.Final + 4.1.84.Final + 2.4.17 + 5.3.0 - 3.6.1 - 5.1.0 + 5.3.0 + + + 6.0.0 - 4.2.1 - 3.3.0 - + 4.7.2 + 2.8.8 4.5.2 + + 5.2.3 + 1.9.0 + + + 4.0.1 + - 7.9.3 - 4.1.5 - 8.6.2 - - - 1.7.30 - 1.2.3 - - 4.12 + 8.4.3 11 UTF-8 - 1.3.5 - 3.1.0 - 3.8.1 - 3.2.0 - 3.0.0-M5 - 3.2.0 - 3.2.4 - 2.8.1 - + 3.2.0 + 3.3.0 + 3.10.1 + 3.0.0-M7 + 3.3.0 + 3.4.0 + 2.12.0 ${file.encoding} ${file.encoding} - @@ -115,12 +85,6 @@ ${zfoo.util.version} - - io.netty - netty-all - ${netty.version} - - org.javassist @@ -135,31 +99,12 @@ ${spring.version} - - org.slf4j - slf4j-api - ${slf4j.version} + org.springframework.boot + spring-boot-starter-logging + ${spring.boot.version} + provided - - - ch.qos.logback - logback-core - ${logback.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - slf4j-api - org.slf4j - - - - junit diff --git a/storage/pom.xml b/storage/pom.xml index b0b0240e..634fd40b 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -10,7 +10,6 @@ jar - 3.0 @@ -24,89 +23,60 @@ 3.0 3.0 + + 5.3.19 + 2.6.7 + 4.12 - - 5.3.17 - 2.4.3 - - - - 1.15 - 2.8.0 - 4.4 - 3.12.0 - 1.4 - 1.2 - 2.14.0 - 4.5.13 - 4.4.14 - 30.1-jre - 3.9.1 - 2.8.6 - 2.4.13 - 5.0.3 - 2.8.8 - 3.2.0 - 5.5.9 - 5.7.0 - 1.28 - - - - 2.12.1 - 1.2.51 - - 4.1.2 - 1.9.0 - 3.27.0-GA - 1.10.22 - + 3.29.2-GA + 1.12.18 + + 2.13.2 - 4.1.63.Final + 4.1.84.Final + 2.4.17 + 5.3.0 - 3.6.1 - 5.1.0 + 5.3.0 + + + 6.0.0 - 4.2.1 - 3.3.0 - + 4.7.2 + 2.8.8 4.5.2 + + 5.2.3 + 1.9.0 + + + 4.0.1 + - 7.9.3 - 4.1.5 - 8.6.2 - - - 1.7.30 - 1.2.3 - - 4.12 + 8.4.3 11 UTF-8 - 1.3.5 - 3.1.0 - 3.8.1 - 3.2.0 - 3.0.0-M5 - 3.2.0 - 3.2.4 - 2.8.1 - + 3.2.0 + 3.3.0 + 3.10.1 + 3.0.0-M7 + 3.3.0 + 3.4.0 + 2.12.0 ${file.encoding} ${file.encoding} - com.zfoo @@ -136,20 +106,29 @@ ${poi.version} - commons-codec - commons-codec + commons-io + commons-io + + + log4j-api + org.apache.logging.log4j - - commons-codec - commons-codec - ${commons-codec.version} - org.apache.poi poi-ooxml ${poi.version} + + + commons-io + commons-io + + + log4j-api + org.apache.logging.log4j + + org.apache.commons @@ -157,31 +136,12 @@ ${csv.version} - - org.slf4j - slf4j-api - ${slf4j.version} + org.springframework.boot + spring-boot-starter-logging + ${spring.boot.version} + provided - - - ch.qos.logback - logback-core - ${logback.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - slf4j-api - org.slf4j - - - - junit diff --git a/util/pom.xml b/util/pom.xml index fab1f5f3..8767d14a 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -10,7 +10,6 @@ jar - 3.0 @@ -24,83 +23,55 @@ 3.0 3.0 + + 5.3.19 + 2.6.7 + 4.12 - - 5.3.17 - 2.4.3 - - - - 1.15 - 2.8.0 - 4.4 - 3.12.0 - 1.4 - 1.2 - 2.14.0 - 4.5.13 - 4.4.14 - 30.1-jre - 3.9.1 - 2.8.6 - 2.4.13 - 5.0.3 - 2.8.8 - 3.2.0 - 5.5.9 - 5.7.0 - 1.28 - - - - 2.12.1 - 1.2.51 - - 4.1.2 - 1.9.0 - 3.27.0-GA - 1.10.22 - + 3.29.2-GA + 1.12.18 + + 2.13.2 - 4.1.63.Final + 4.1.84.Final + 2.4.17 + 5.3.0 - 3.6.1 - 5.1.0 + 5.3.0 + + + 6.0.0 - 4.2.1 - 3.3.0 - + 4.7.2 + 2.8.8 4.5.2 + + 5.2.3 + 1.9.0 + + + 4.0.1 + - 7.9.3 - 4.1.5 - 8.6.2 - - - 1.7.30 - 1.2.3 - - 4.12 + 8.4.3 11 UTF-8 - 1.3.5 - 3.1.0 - 3.8.1 - 3.2.0 - 3.0.0-M5 - 3.2.0 - 3.2.4 - 2.8.1 - + 3.2.0 + 3.3.0 + 3.10.1 + 3.0.0-M7 + 3.3.0 + 3.4.0 + 2.12.0 ${file.encoding} ${file.encoding} @@ -127,6 +98,13 @@ ${spring.version} + + org.springframework.boot + spring-boot-starter-logging + ${spring.boot.version} + provided + + junit