From cbbb6afc58288bea0dc211009c2cd3b39cbd194f Mon Sep 17 00:00:00 2001 From: zhangping17 Date: Wed, 20 Sep 2023 14:52:24 +0800 Subject: [PATCH] fixes #719 --- jcommon/aliyun/pom.xml | 59 ++- jcommon/annotation/pom.xml | 69 ++- jcommon/antlr/pom.xml | 90 ++-- jcommon/aop/pom.xml | 55 +-- jcommon/api/pom.xml | 26 +- jcommon/buddy/buddy-common/pom.xml | 102 ++-- jcommon/buddy/buddy-demo/pom.xml | 126 ++--- jcommon/buddy/pom.xml | 128 +++-- jcommon/catPlugin/pom.xml | 26 +- jcommon/codecheck/pom.xml | 73 ++- .../com/xiaomi/youpin/codecheck/DocCheck.java | 9 +- .../codecheck/docCheck/JavaDocReader.java | 241 +++++---- jcommon/codegen/pom.xml | 100 ++-- jcommon/coloregg/pom.xml | 26 +- jcommon/common/pom.xml | 311 +++++------- .../xiaomi/data/push/crypto/YoupinAes.java | 84 ++-- jcommon/cron/pom.xml | 24 +- jcommon/crypto/pom.xml | 46 +- .../com/xiaomi/youpin/common/crypto/Aes.java | 150 +++--- jcommon/dbLocking/pom.xml | 76 ++- jcommon/df/pom.xml | 24 +- jcommon/disruptor/pom.xml | 53 +- .../docean-plugin/docean-plugin-akka/pom.xml | 44 +- .../docean-plugin/docean-plugin-aop/pom.xml | 24 +- .../docean-plugin/docean-plugin-api/pom.xml | 29 +- .../docean-plugin/docean-plugin-cat/pom.xml | 26 +- .../docean-plugin-classloader/pom.xml | 34 +- .../docean-plugin-config/pom.xml | 26 +- .../docean-plugin-configuration/pom.xml | 49 +- .../pom.xml | 49 +- .../docean-plugin-datasource/pom.xml | 118 ++--- .../docean-plugin/docean-plugin-db/pom.xml | 89 ++-- .../docean-plugin/docean-plugin-dmesh/pom.xml | 114 +++-- .../docean-plugin-dubbo-serverless/pom.xml | 96 ++-- .../docean-plugin/docean-plugin-dubbo/pom.xml | 77 ++- .../docean-plugin-es-antlr4/pom.xml | 110 ++--- .../docean-plugin/docean-plugin-es/pom.xml | 51 +- .../docean-plugin/docean-plugin-etcd/pom.xml | 54 +-- .../docean-plugin/docean-plugin-grpc/pom.xml | 76 ++- .../docean-plugin-http-server/pom.xml | 55 +-- .../docean-plugin/docean-plugin-http/pom.xml | 24 +- .../docean-plugin-influxdb/pom.xml | 63 +-- .../docean-plugin/docean-plugin-json/pom.xml | 45 +- .../docean-plugin/docean-plugin-k8s/pom.xml | 72 ++- .../docean-plugin/docean-plugin-log/pom.xml | 55 +-- .../docean-plugin-mesh-dubbo/pom.xml | 34 +- .../docean-plugin-mongodb/pom.xml | 60 ++- .../docean-plugin/docean-plugin-mvc/pom.xml | 42 +- .../docean-plugin-mybatis-plus/pom.xml | 114 ++--- .../docean-plugin-mybatis/pom.xml | 132 ++--- .../docean-plugin/docean-plugin-nacos/pom.xml | 53 +- .../docean-plugin/docean-plugin-redis/pom.xml | 74 ++- .../docean-plugin-rocketmq/pom.xml | 75 ++- .../docean-plugin/docean-plugin-rpc/pom.xml | 61 +-- .../docean-plugin-sentinel/pom.xml | 64 ++- .../docean-plugin-shardingSphere/pom.xml | 126 ++--- .../docean-plugin-sidecar/pom.xml | 100 ++-- .../docean-plugin-spring/pom.xml | 37 +- .../docean-plugin/docean-plugin-sql/pom.xml | 61 ++- .../docean-plugin/docean-plugin-test/pom.xml | 330 ++++++------- jcommon/docean-plugin/pom.xml | 123 +++-- jcommon/docean/pom.xml | 162 +++---- jcommon/docker/pom.xml | 96 ++-- jcommon/easy/pom.xml | 45 +- jcommon/es/pom.xml | 217 ++++----- jcommon/event/pom.xml | 47 +- jcommon/excel/pom.xml | 87 ++-- jcommon/feishu/pom.xml | 57 +-- jcommon/file/pom.xml | 24 +- jcommon/geth/pom.xml | 76 ++- jcommon/gitlab/pom.xml | 99 ++-- jcommon/graalvm/pom.xml | 251 +++------- jcommon/grpc/pom.xml | 93 ++-- jcommon/health/pom.xml | 95 ++-- jcommon/hera/hera-trace/pom.xml | 24 +- jcommon/hera/pom.xml | 32 +- jcommon/http/pom.xml | 66 ++- jcommon/infra-common/pom.xml | 30 +- jcommon/infra-result/pom.xml | 54 +-- jcommon/jmonitor/pom.xml | 42 +- jcommon/k8s/pom.xml | 63 ++- jcommon/ks3/pom.xml | 72 ++- jcommon/log/pom.xml | 113 ++--- jcommon/match/pom.xml | 52 +- jcommon/micloud/pom.xml | 92 ++-- jcommon/mistarter/pom.xml | 82 ++-- jcommon/monespring/pom.xml | 58 +-- jcommon/mongodb/pom.xml | 54 +-- jcommon/monitor/pom.xml | 40 +- jcommon/mquic/pom.xml | 84 ++-- .../mv-plugin/codecheck-maven-plugin/pom.xml | 32 +- .../mv-plugin/jarcheck-maven-plugin/pom.xml | 138 +++--- jcommon/mv-plugin/mesh-plugin/pom.xml | 58 --- .../java/run/mone/mesh/plugin/MeshMojo.java | 42 -- jcommon/mv-plugin/mv-demo/pom.xml | 80 +-- jcommon/mv-plugin/native-plugin/pom.xml | 146 +++--- jcommon/mv-plugin/pom.xml | 38 +- jcommon/mybatis-plugins/pom.xml | 40 +- jcommon/nacos/pom.xml | 58 ++- jcommon/nginx/pom.xml | 54 +-- jcommon/openai/pom.xml | 113 ++--- jcommon/pom.xml | 459 ++++++++---------- jcommon/pool/pom.xml | 66 ++- jcommon/processor/pom.xml | 118 ++--- jcommon/prometheus/pom.xml | 92 ++-- jcommon/prometheus/prometheus-client/pom.xml | 2 +- jcommon/prometheus/prometheus-dubbo/pom.xml | 54 +-- jcommon/prometheus/prometheus-metrics/pom.xml | 52 +- jcommon/prometheus/prometheus-redis/pom.xml | 96 ++-- jcommon/prometheus/prometheus-sql/pom.xml | 68 ++- jcommon/prometheus/prometheus-starter/pom.xml | 63 ++- .../prometheus/prometheus-trace-etl/pom.xml | 2 +- jcommon/raft/pom.xml | 193 ++++---- jcommon/rcurve/pom.xml | 153 +++--- jcommon/redis/pom.xml | 82 ++-- jcommon/rpc-codes/pom.xml | 120 ++--- jcommon/rpc/pom.xml | 129 +++-- jcommon/schedule/pom.xml | 191 ++++---- jcommon/sidecar-api/pom.xml | 33 +- jcommon/spider/pom.xml | 62 +-- jcommon/sre/pom.xml | 59 +-- jcommon/ssh/pom.xml | 51 +- jcommon/struct/pom.xml | 26 +- jcommon/teambition/pom.xml | 68 ++- jcommon/test/pom.xml | 108 ++--- 125 files changed, 4367 insertions(+), 5850 deletions(-) delete mode 100644 jcommon/mv-plugin/mesh-plugin/pom.xml delete mode 100644 jcommon/mv-plugin/mesh-plugin/src/main/java/run/mone/mesh/plugin/MeshMojo.java diff --git a/jcommon/aliyun/pom.xml b/jcommon/aliyun/pom.xml index 50be05b4b..72161cd40 100644 --- a/jcommon/aliyun/pom.xml +++ b/jcommon/aliyun/pom.xml @@ -1,33 +1,28 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - aliyun - - - - com.aliyun - aliyun-java-sdk-core - 4.4.3 - - - - com.aliyun - aliyun-java-sdk-ecs - 4.17.1 - - - com.alibaba - fastjson - 1.2.70 - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + aliyun + + + com.aliyun + aliyun-java-sdk-core + 4.4.3 + + + com.aliyun + aliyun-java-sdk-ecs + 4.17.1 + + + com.alibaba + fastjson + 1.2.70 + + + diff --git a/jcommon/annotation/pom.xml b/jcommon/annotation/pom.xml index fac55184b..a61242a72 100644 --- a/jcommon/annotation/pom.xml +++ b/jcommon/annotation/pom.xml @@ -1,41 +1,30 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - annotation - 1.6.1-SNAPSHOT - - - - - - run.mone - common - 1.7.2-SNAPSHOT - - - fastjson - com.alibaba - - - - - - - run.mone - redis - 1.8-SNAPSHOT - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + annotation + 1.6.1-jdk20-SNAPSHOT + + + run.mone + common + 1.7.2-jdk20-SNAPSHOT + + + fastjson + com.alibaba + + + + + run.mone + redis + 1.8-SNAPSHOT + + + diff --git a/jcommon/antlr/pom.xml b/jcommon/antlr/pom.xml index 96ce60166..9e114566f 100644 --- a/jcommon/antlr/pom.xml +++ b/jcommon/antlr/pom.xml @@ -1,52 +1,40 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - antlr - - - - - org.antlr - antlr4-runtime - 4.7.1 - - - - org.antlr - antlr4 - 4.7.1 - - - - commons-lang - commons-lang - 2.6 - - - - - com.facebook.presto - presto-parser - 0.244 - provided - - - - org.apache.ignite - ignite-core - 2.8.1 - test - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + antlr + + + org.antlr + antlr4-runtime + 4.7.1 + + + org.antlr + antlr4 + 4.7.1 + + + commons-lang + commons-lang + 2.6 + + + com.facebook.presto + presto-parser + 0.244 + provided + + + org.apache.ignite + ignite-core + 2.8.1 + test + + + diff --git a/jcommon/aop/pom.xml b/jcommon/aop/pom.xml index d6f4495cb..de050eb32 100644 --- a/jcommon/aop/pom.xml +++ b/jcommon/aop/pom.xml @@ -1,31 +1,26 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - aop - 1.4-SNAPSHOT - - - - - - - - org.aspectj - aspectjweaver - 1.8.12 - compile - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + aop + 1.4-jdk20-SNAPSHOT + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + org.aspectj + aspectjweaver + 1.8.12 + compile + + + diff --git a/jcommon/api/pom.xml b/jcommon/api/pom.xml index cb68243c0..863eafb8e 100644 --- a/jcommon/api/pom.xml +++ b/jcommon/api/pom.xml @@ -1,16 +1,12 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - api - 1.4.1-SNAPSHOT - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + api + 1.4.1-jdk20-SNAPSHOT + diff --git a/jcommon/buddy/buddy-common/pom.xml b/jcommon/buddy/buddy-common/pom.xml index 51e519fa4..451f90bf9 100644 --- a/jcommon/buddy/buddy-common/pom.xml +++ b/jcommon/buddy/buddy-common/pom.xml @@ -1,61 +1,43 @@ - - - buddy - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - buddy-common - - - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.6 - - - jar-with-dependencies - - ${project.artifactId}-${project.version} - false - - - agent.BuddyAgent - agent.BuddyAgent - true - true - - - - - - assemble-all - package - - single - - - - - - - - - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + buddy + 1.4-jdk20-SNAPSHOT + + buddy-common + + + + maven-assembly-plugin + 2.6 + + + assemble-all + package + + single + + + + + + jar-with-dependencies + + ${project.artifactId}-${project.version} + false + + + agent.BuddyAgent + agent.BuddyAgent + true + true + + + + + + + diff --git a/jcommon/buddy/buddy-demo/pom.xml b/jcommon/buddy/buddy-demo/pom.xml index b44c3dfad..839b07aac 100644 --- a/jcommon/buddy/buddy-demo/pom.xml +++ b/jcommon/buddy/buddy-demo/pom.xml @@ -1,75 +1,53 @@ - - - buddy - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - buddy-demo - - - - - - - io.opentelemetry - opentelemetry-extension-annotations - 1.4.0 - - - - - - redis.clients - jedis - 3.0.0 - - - - - run.mone - redis - 1.8-SNAPSHOT - - - - com.squareup.okhttp3 - okhttp - 4.9.1 - - - - - org.nutz - nutz - 1.r.67 - - - - mysql - mysql-connector-java - 5.1.46 - - - - ch.qos.logback - logback-classic - 1.2.3 - - - - ch.qos.logback - logback-core - 1.2.3 - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + buddy + 1.4-jdk20-SNAPSHOT + + buddy-demo + + + io.opentelemetry + opentelemetry-extension-annotations + 1.4.0 + + + redis.clients + jedis + 3.0.0 + + + run.mone + redis + 1.8-SNAPSHOT + + + com.squareup.okhttp3 + okhttp + 4.9.1 + + + org.nutz + nutz + 1.r.67 + + + mysql + mysql-connector-java + 5.1.46 + + + ch.qos.logback + logback-classic + 1.2.3 + + + ch.qos.logback + logback-core + 1.2.3 + + + diff --git a/jcommon/buddy/pom.xml b/jcommon/buddy/pom.xml index 2639b7217..b10b99dc1 100644 --- a/jcommon/buddy/pom.xml +++ b/jcommon/buddy/pom.xml @@ -1,74 +1,56 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - buddy - pom - - buddy-demo - buddy-common - - - - - - - net.bytebuddy - byte-buddy - 1.11.8 - - - - net.bytebuddy - byte-buddy-agent - 1.11.8 - - - - com.google.auto.service - auto-service - 1.0 - test - - - - org.projectlombok - lombok - 1.18.4 - provided - - - - - com.squareup.okhttp3 - okhttp - 4.9.1 - provided - - - - ch.qos.logback - logback-classic - 1.1.2 - - - - ch.qos.logback - logback-core - 1.1.2 - - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + buddy + pom + + buddy-demo + buddy-common + + + + net.bytebuddy + byte-buddy + 1.11.8 + + + net.bytebuddy + byte-buddy-agent + 1.11.8 + + + com.google.auto.service + auto-service + 1.0 + test + + + org.projectlombok + lombok + 1.18.28 + provided + + + com.squareup.okhttp3 + okhttp + 4.9.1 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + + + ch.qos.logback + logback-core + 1.1.2 + + + diff --git a/jcommon/catPlugin/pom.xml b/jcommon/catPlugin/pom.xml index 4e964fa6e..75123ad29 100644 --- a/jcommon/catPlugin/pom.xml +++ b/jcommon/catPlugin/pom.xml @@ -1,17 +1,11 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - catPlugin - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + catPlugin + diff --git a/jcommon/codecheck/pom.xml b/jcommon/codecheck/pom.xml index c14effc95..7e4227707 100644 --- a/jcommon/codecheck/pom.xml +++ b/jcommon/codecheck/pom.xml @@ -1,46 +1,29 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 1.4-SNAPSHOT - 4.0.0 - - codecheck - - - - - dom4j - dom4j - 1.6.1 - - - - run.mone - infra-result - 1.4-SNAPSHOT - - - - com.sun - tools - 1.8 - system - ${java.home}/../lib/tools.jar - - - - org.apache.commons - commons-lang3 - 3.7 - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + codecheck + 1.4-jdk20-SNAPSHOT + + + dom4j + dom4j + 1.6.1 + + + run.mone + infra-result + 1.4-jdk20-SNAPSHOT + + + org.apache.commons + commons-lang3 + 3.7 + + + diff --git a/jcommon/codecheck/src/main/java/com/xiaomi/youpin/codecheck/DocCheck.java b/jcommon/codecheck/src/main/java/com/xiaomi/youpin/codecheck/DocCheck.java index 9415585c6..09d837374 100644 --- a/jcommon/codecheck/src/main/java/com/xiaomi/youpin/codecheck/DocCheck.java +++ b/jcommon/codecheck/src/main/java/com/xiaomi/youpin/codecheck/DocCheck.java @@ -16,7 +16,6 @@ package com.xiaomi.youpin.codecheck; -import com.xiaomi.youpin.codecheck.docCheck.JavaDocReader; import java.io.File; import java.io.Serializable; @@ -36,10 +35,10 @@ public Map getDoc(String path) { //xxx.java校验 List files = CommonUtils.searchFiles(new File(path), ".java"); files.stream().forEach(it -> { - String javaDocRes = JavaDocReader.getDoc(it.getPath()); - if (!javaDocRes.equals("")) { - res.put(it.getPath(), javaDocRes); - } +// String javaDocRes = JavaDocReader.getDoc(it.getPath()); +// if (!javaDocRes.equals("")) { +// res.put(it.getPath(), javaDocRes); +// } }); return res; diff --git a/jcommon/codecheck/src/main/java/com/xiaomi/youpin/codecheck/docCheck/JavaDocReader.java b/jcommon/codecheck/src/main/java/com/xiaomi/youpin/codecheck/docCheck/JavaDocReader.java index 84671b5e9..d6f0211ac 100644 --- a/jcommon/codecheck/src/main/java/com/xiaomi/youpin/codecheck/docCheck/JavaDocReader.java +++ b/jcommon/codecheck/src/main/java/com/xiaomi/youpin/codecheck/docCheck/JavaDocReader.java @@ -1,122 +1,119 @@ -/* - * Copyright 2020 Xiaomi - * - * 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.xiaomi.youpin.codecheck.docCheck; - -import com.sun.javadoc.ClassDoc; -import com.sun.javadoc.MethodDoc; -import com.sun.javadoc.RootDoc; -import com.xiaomi.youpin.codecheck.po.CheckResult; -import org.apache.commons.lang3.tuple.Pair; - -/** - * @author goodjava@qq.com - */ -public class JavaDocReader { - - private static final String DESC = "interface should have java doc or comment"; - private static final String CHINA_DESC = "interface should have java doc or comment"; - private static final Pair success = Pair.of(CheckResult.INFO, CheckResult.getInfoRes("DubboMethodMustReturnResultRule", "", "")); - - private static RootDoc root; - - public static class Doclet { - - public Doclet() { - } - - public static boolean start(RootDoc root) { - JavaDocReader.root = root; - return true; - } - } - - public static Pair show() { - boolean isWarn = false; - String methodName = ""; - ClassDoc[] classes = root.classes(); - for (int i = 0; i < classes.length; ++i) { - if (classes[i].isInterface()) { - for (MethodDoc method : classes[i].methods()) { - if (method.commentText() == null || "".equals(method.commentText())) { - isWarn = true; - methodName += method.name() + " "; - } - } - } - } - - return isWarn ? Pair.of(CheckResult.WARN, CheckResult.getWarnRes("method name: " + methodName, DESC, CHINA_DESC)) : success; - - } - - public static String show0() { - ClassDoc[] classes = root.classes(); - String res = ""; - for (int i = 0; i < classes.length; ++i) { - if (classes[i].getRawCommentText() != null && !"".equals(classes[i].getRawCommentText())) { - res = "ClassName: " + classes[i].name() + ", doc: \n" + classes[i].getRawCommentText() + "\n"; - } - for (MethodDoc method : classes[i].methods()) { - if (method.commentText() != null && !"".equals(method.commentText())) { - res += "MethodName: " + method.name() + ", doc: \n" + method.commentText() + "\n"; - } - } - } - - return res; - } - - public static RootDoc getRoot() { - return root; - } - - public JavaDocReader() { - - } - - - public static Pair check(String path) { - if (path == null || "".equals(path)) { - return success; - } - try { - com.sun.tools.javadoc.Main.execute(new String[]{"-doclet", - Doclet.class.getName(), - "-encoding", "utf-8", - path}); - return show(); - } catch (Throwable e) { - return success; - } - } - - public static String getDoc(String path) { - if (path == null || "".equals(path)) { - return ""; - } - try { - com.sun.tools.javadoc.Main.execute(new String[]{"-doclet", - Doclet.class.getName(), - "-encoding", "utf-8", - path}); - return show0(); - } catch (Throwable e) { - return ""; - } - } - -} +///* +// * Copyright 2020 Xiaomi +// * +// * 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.xiaomi.youpin.codecheck.docCheck; +// +//import com.xiaomi.youpin.codecheck.po.CheckResult; +//import org.apache.commons.lang3.tuple.Pair; +// +///** +// * @author goodjava@qq.com +// */ +//public class JavaDocReader { +// +// private static final String DESC = "interface should have java doc or comment"; +// private static final String CHINA_DESC = "interface should have java doc or comment"; +// private static final Pair success = Pair.of(CheckResult.INFO, CheckResult.getInfoRes("DubboMethodMustReturnResultRule", "", "")); +// +// private static RootDoc root; +// +// public static class Doclet { +// +// public Doclet() { +// } +// +// public static boolean start(RootDoc root) { +// JavaDocReader.root = root; +// return true; +// } +// } +// +// public static Pair show() { +// boolean isWarn = false; +// String methodName = ""; +// ClassDoc[] classes = root.classes(); +// for (int i = 0; i < classes.length; ++i) { +// if (classes[i].isInterface()) { +// for (MethodDoc method : classes[i].methods()) { +// if (method.commentText() == null || "".equals(method.commentText())) { +// isWarn = true; +// methodName += method.name() + " "; +// } +// } +// } +// } +// +// return isWarn ? Pair.of(CheckResult.WARN, CheckResult.getWarnRes("method name: " + methodName, DESC, CHINA_DESC)) : success; +// +// } +// +// public static String show0() { +// ClassDoc[] classes = root.classes(); +// String res = ""; +// for (int i = 0; i < classes.length; ++i) { +// if (classes[i].getRawCommentText() != null && !"".equals(classes[i].getRawCommentText())) { +// res = "ClassName: " + classes[i].name() + ", doc: \n" + classes[i].getRawCommentText() + "\n"; +// } +// for (MethodDoc method : classes[i].methods()) { +// if (method.commentText() != null && !"".equals(method.commentText())) { +// res += "MethodName: " + method.name() + ", doc: \n" + method.commentText() + "\n"; +// } +// } +// } +// +// return res; +// } +// +// public static RootDoc getRoot() { +// return root; +// } +// +// public JavaDocReader() { +// +// } +// +// +// public static Pair check(String path) { +// if (path == null || "".equals(path)) { +// return success; +// } +// try { +// com.sun.tools.javadoc.Main.execute(new String[]{"-doclet", +// Doclet.class.getName(), +// "-encoding", "utf-8", +// path}); +// return show(); +// } catch (Throwable e) { +// return success; +// } +// } +// +// public static String getDoc(String path) { +// if (path == null || "".equals(path)) { +// return ""; +// } +// try { +// com.sun.tools.javadoc.Main.execute(new String[]{"-doclet", +// Doclet.class.getName(), +// "-encoding", "utf-8", +// path}); +// return show0(); +// } catch (Throwable e) { +// return ""; +// } +// } +// +//} diff --git a/jcommon/codegen/pom.xml b/jcommon/codegen/pom.xml index b4e701dcf..f62fe5559 100644 --- a/jcommon/codegen/pom.xml +++ b/jcommon/codegen/pom.xml @@ -1,54 +1,48 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - codegen - 1.4-SNAPSHOT - - - commons-io - commons-io - 2.6 - compile - - - - run.mone - codegen-temlates - 1.0-SNAPSHOT - compile - - - - com.ibeetl - beetl - 2.7.14 - - - org.apache.commons - commons-lang3 - 3.8.1 - compile - - - infra-result - - - thrift - org.apache.thrift - - - run.mone - 1.4-SNAPSHOT - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + codegen + 1.4-jdk20-SNAPSHOT + + + commons-io + commons-io + 2.6 + compile + + + run.mone + codegen-temlates + 1.0-SNAPSHOT + compile + + + com.ibeetl + beetl + 2.7.14 + + + org.apache.commons + commons-lang3 + 3.8.1 + compile + + + run.mone + infra-result + 1.4-jdk20-SNAPSHOT + + + thrift + org.apache.thrift + + + + + diff --git a/jcommon/coloregg/pom.xml b/jcommon/coloregg/pom.xml index a0ef9b882..15b403202 100644 --- a/jcommon/coloregg/pom.xml +++ b/jcommon/coloregg/pom.xml @@ -1,16 +1,12 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - coloregg - 1.4-SNAPSHOT - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + coloregg + 1.4-jdk20-SNAPSHOT + diff --git a/jcommon/common/pom.xml b/jcommon/common/pom.xml index 4545c5f2f..c861f63da 100644 --- a/jcommon/common/pom.xml +++ b/jcommon/common/pom.xml @@ -1,180 +1,137 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - common - - 1.7.2-SNAPSHOT - - - - - - - org.aspectj - aspectjweaver - 1.8.12 - compile - - - - - org.mybatis - mybatis - 3.4.6 - provided - - - - + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + common + 1.7.2-jdk20-SNAPSHOT + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + org.aspectj + aspectjweaver + 1.8.12 + compile + + + org.mybatis + mybatis + 3.4.6 + provided + + + mysql + mysql-connector-java + 5.1.46 + provided + + + com.mchange + c3p0 + 0.9.5.2 + provided + + + org.springframework + spring-jdbc + 5.0.6.RELEASE + provided + + + org.springframework + spring-aop + 5.0.6.RELEASE + provided + + + org.mybatis + mybatis-spring + 1.3.1 + provided + + + io.netty + netty-all + 4.1.36.Final + provided + + + org.apache.commons + commons-lang3 + 3.7 + + + org.apache.httpcomponents + httpclient + 4.5.5 + + + org.mybatis.generator + mybatis-generator-core + 1.3.6 + provided + + + cglib + cglib-nodep + 3.2.7 + + + org.reflections + reflections + 0.9.11 + + + org.projectlombok + lombok + 1.18.28 + provided + + + run.mone + crypto + 1.4-jdk20-SNAPSHOT + + + com.alibaba + transmittable-thread-local + 2.12.1 + test + + + com.github.rholder + guava-retrying + 2.0.0 + test + + + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.2 + + mysql mysql-connector-java - 5.1.46 - provided - - - - - com.mchange - c3p0 - 0.9.5.2 - provided - - - - org.springframework - spring-jdbc - 5.0.6.RELEASE - provided - - - - org.springframework - spring-aop - 5.0.6.RELEASE - provided - - - - - org.mybatis - mybatis-spring - 1.3.1 - provided - - - - - io.netty - netty-all - 4.1.36.Final - provided - - - - org.apache.commons - commons-lang3 - 3.7 - - - - org.apache.httpcomponents - httpclient - 4.5.5 - - - - - org.mybatis.generator - mybatis-generator-core - 1.3.6 - provided - - - - - cglib - cglib-nodep - 3.2.7 - - - - org.reflections - reflections - 0.9.11 - - - - org.projectlombok - lombok - 1.18.4 - provided - - - - run.mone - crypto - 1.4-SNAPSHOT - - - - com.alibaba - transmittable-thread-local - 2.12.1 - test - - - - com.github.rholder - guava-retrying - 2.0.0 - test - - - - - - - - - - - - - org.mybatis.generator - mybatis-generator-maven-plugin - 1.3.2 - - true - true - - - - - - mysql - mysql-connector-java - 5.1.47 - - - - - - - - - - - - \ No newline at end of file + 5.1.47 + + + + true + true + + + + + diff --git a/jcommon/common/src/main/java/com/xiaomi/data/push/crypto/YoupinAes.java b/jcommon/common/src/main/java/com/xiaomi/data/push/crypto/YoupinAes.java index 68e58642c..3a50896a0 100644 --- a/jcommon/common/src/main/java/com/xiaomi/data/push/crypto/YoupinAes.java +++ b/jcommon/common/src/main/java/com/xiaomi/data/push/crypto/YoupinAes.java @@ -1,42 +1,42 @@ -/* - * Copyright 2020 Xiaomi - * - * 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.xiaomi.data.push.crypto; - - -import com.xiaomi.youpin.common.crypto.Aes; -import lombok.extern.slf4j.Slf4j; - -/** - * @author goodjava@qq.com - */ -@Slf4j -public class YoupinAes { - - - // 加密 - public static String encrypt(String sSrc, String sKey, String ivParameter) throws Exception { - return Aes.encrypt(sSrc,sKey,ivParameter); - } - - - // 解密 - public static String decrypt(String sSrc, String sKey, String ivParameter) { - return Aes.decrypt(sSrc,sKey,ivParameter); - } - - -} +///* +// * Copyright 2020 Xiaomi +// * +// * 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.xiaomi.data.push.crypto; +// +// +//import com.xiaomi.youpin.common.crypto.Aes; +//import lombok.extern.slf4j.Slf4j; +// +///** +// * @author goodjava@qq.com +// */ +//@Slf4j +//public class YoupinAes { +// +// +// // 加密 +// public static String encrypt(String sSrc, String sKey, String ivParameter) throws Exception { +// return Aes.encrypt(sSrc,sKey,ivParameter); +// } +// +// +// // 解密 +// public static String decrypt(String sSrc, String sKey, String ivParameter) { +// return Aes.decrypt(sSrc,sKey,ivParameter); +// } +// +// +//} diff --git a/jcommon/cron/pom.xml b/jcommon/cron/pom.xml index 366f164df..7e02112cf 100644 --- a/jcommon/cron/pom.xml +++ b/jcommon/cron/pom.xml @@ -1,15 +1,11 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - cron - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + cron + diff --git a/jcommon/crypto/pom.xml b/jcommon/crypto/pom.xml index 113c93d95..0f8b5083f 100644 --- a/jcommon/crypto/pom.xml +++ b/jcommon/crypto/pom.xml @@ -1,29 +1,19 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - crypto - - - - - - - org.projectlombok - lombok - 1.18.4 - provided - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + crypto + + + org.projectlombok + lombok + 1.18.28 + provided + + + diff --git a/jcommon/crypto/src/main/java/com/xiaomi/youpin/common/crypto/Aes.java b/jcommon/crypto/src/main/java/com/xiaomi/youpin/common/crypto/Aes.java index 922ae132a..446fb7d27 100644 --- a/jcommon/crypto/src/main/java/com/xiaomi/youpin/common/crypto/Aes.java +++ b/jcommon/crypto/src/main/java/com/xiaomi/youpin/common/crypto/Aes.java @@ -1,75 +1,75 @@ -/* - * Copyright 2020 Xiaomi - * - * 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.xiaomi.youpin.common.crypto; - - -import lombok.extern.slf4j.Slf4j; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; - -import javax.crypto.Cipher; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; -import java.net.URLEncoder; - -/** - * @author goodjava@qq.com - */ -@Slf4j -public class Aes { - - // 加密 - public static String encrypt(String sSrc, String sKey, String ivParameter) throws Exception { - return encrypt(sSrc, sKey, ivParameter, false); - } - - - public static String encrypt(String sSrc, String sKey, String ivParameter, boolean urlEncode) throws Exception { - Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); - byte[] raw = sKey.getBytes(); - SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES"); - IvParameterSpec iv = new IvParameterSpec(ivParameter.getBytes()); - cipher.init(Cipher.ENCRYPT_MODE, skeySpec, iv); - byte[] encrypted = cipher.doFinal(sSrc.getBytes("utf-8")); - String res = new BASE64Encoder().encode(encrypted); - if (urlEncode) { - return URLEncoder.encode(res, "utf-8"); - } - return res; - } - - - // 解密 - public static String decrypt(String sSrc, String sKey, String ivParameter) { - try { - byte[] raw = sKey.getBytes("ASCII"); - SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES"); - Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); - IvParameterSpec iv = new IvParameterSpec(ivParameter.getBytes()); - cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv); - byte[] encrypted1 = new BASE64Decoder().decodeBuffer(sSrc); - byte[] original = cipher.doFinal(encrypted1); - String originalString = new String(original, "utf-8"); - return originalString; - } catch (Exception ex) { - log.warn(ex.getMessage(), ex); - return null; - } - } - - -} +///* +// * Copyright 2020 Xiaomi +// * +// * 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.xiaomi.youpin.common.crypto; +// +// +//import lombok.extern.slf4j.Slf4j; +////import sun.misc.BASE64Decoder; +////import sun.misc.BASE64Encoder; +// +//import javax.crypto.Cipher; +//import javax.crypto.spec.IvParameterSpec; +//import javax.crypto.spec.SecretKeySpec; +//import java.net.URLEncoder; +// +///** +// * @author goodjava@qq.com +// */ +//@Slf4j +//public class Aes { +// +// // 加密 +// public static String encrypt(String sSrc, String sKey, String ivParameter) throws Exception { +// return encrypt(sSrc, sKey, ivParameter, false); +// } +// +// +// public static String encrypt(String sSrc, String sKey, String ivParameter, boolean urlEncode) throws Exception { +// Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); +// byte[] raw = sKey.getBytes(); +// SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES"); +// IvParameterSpec iv = new IvParameterSpec(ivParameter.getBytes()); +// cipher.init(Cipher.ENCRYPT_MODE, skeySpec, iv); +// byte[] encrypted = cipher.doFinal(sSrc.getBytes("utf-8")); +// String res = new BASE64Encoder().encode(encrypted); +// if (urlEncode) { +// return URLEncoder.encode(res, "utf-8"); +// } +// return res; +// } +// +// +// // 解密 +// public static String decrypt(String sSrc, String sKey, String ivParameter) { +// try { +// byte[] raw = sKey.getBytes("ASCII"); +// SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES"); +// Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); +// IvParameterSpec iv = new IvParameterSpec(ivParameter.getBytes()); +// cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv); +// byte[] encrypted1 = new BASE64Decoder().decodeBuffer(sSrc); +// byte[] original = cipher.doFinal(encrypted1); +// String originalString = new String(original, "utf-8"); +// return originalString; +// } catch (Exception ex) { +// log.warn(ex.getMessage(), ex); +// return null; +// } +// } +// +// +//} diff --git a/jcommon/dbLocking/pom.xml b/jcommon/dbLocking/pom.xml index cf48076dd..19ea79561 100644 --- a/jcommon/dbLocking/pom.xml +++ b/jcommon/dbLocking/pom.xml @@ -1,44 +1,34 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - dbLocking - - - - - run.mone - nutz - 1.r.68-open-SNAPSHOT - - - - org.mockito - mockito-core - 2.23.4 - - - com.mchange - c3p0 - 0.9.5.4 - test - - - - mysql - mysql-connector-java - 5.1.46 - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + dbLocking + + + run.mone + nutz + 1.r.68-open-SNAPSHOT + + + org.mockito + mockito-core + 2.23.4 + + + com.mchange + c3p0 + 0.9.5.4 + test + + + mysql + mysql-connector-java + 5.1.46 + + + diff --git a/jcommon/df/pom.xml b/jcommon/df/pom.xml index bd763b77f..57745394a 100644 --- a/jcommon/df/pom.xml +++ b/jcommon/df/pom.xml @@ -1,15 +1,11 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - df - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + df + diff --git a/jcommon/disruptor/pom.xml b/jcommon/disruptor/pom.xml index 3d81a101b..60cf2c326 100644 --- a/jcommon/disruptor/pom.xml +++ b/jcommon/disruptor/pom.xml @@ -1,32 +1,23 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - run.mone.disruptor - disruptor - - - 8 - 8 - - - - - - - com.lmax - disruptor - 3.4.2 - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + run.mone.disruptor + disruptor + + 8 + 8 + + + + com.lmax + disruptor + 3.4.2 + + + diff --git a/jcommon/docean-plugin/docean-plugin-akka/pom.xml b/jcommon/docean-plugin/docean-plugin-akka/pom.xml index 43503d45e..7d219be9a 100644 --- a/jcommon/docean-plugin/docean-plugin-akka/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-akka/pom.xml @@ -1,28 +1,18 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-akka - - - - - - com.typesafe.akka - akka-actor_2.13 - 2.6.11 - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-akka + + + com.typesafe.akka + akka-actor_2.13 + 2.6.11 + + + diff --git a/jcommon/docean-plugin/docean-plugin-aop/pom.xml b/jcommon/docean-plugin/docean-plugin-aop/pom.xml index 2addc34d1..47b11c417 100644 --- a/jcommon/docean-plugin/docean-plugin-aop/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-aop/pom.xml @@ -1,15 +1,11 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-aop - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-aop + diff --git a/jcommon/docean-plugin/docean-plugin-api/pom.xml b/jcommon/docean-plugin/docean-plugin-api/pom.xml index 776263ee4..8e85be8bd 100644 --- a/jcommon/docean-plugin/docean-plugin-api/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-api/pom.xml @@ -1,20 +1,11 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-api - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-api + diff --git a/jcommon/docean-plugin/docean-plugin-cat/pom.xml b/jcommon/docean-plugin/docean-plugin-cat/pom.xml index 9dd98a4dc..b549d08ec 100644 --- a/jcommon/docean-plugin/docean-plugin-cat/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-cat/pom.xml @@ -1,17 +1,11 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-cat - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-cat + diff --git a/jcommon/docean-plugin/docean-plugin-classloader/pom.xml b/jcommon/docean-plugin/docean-plugin-classloader/pom.xml index 955ffd6da..3e6addcb2 100644 --- a/jcommon/docean-plugin/docean-plugin-classloader/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-classloader/pom.xml @@ -1,20 +1,16 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-classloader - - - 8 - 8 - UTF-8 - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-classloader + + UTF-8 + 8 + 8 + + diff --git a/jcommon/docean-plugin/docean-plugin-config/pom.xml b/jcommon/docean-plugin/docean-plugin-config/pom.xml index af4c682c9..1e427a5a0 100644 --- a/jcommon/docean-plugin/docean-plugin-config/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-config/pom.xml @@ -1,17 +1,11 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - - 4.0.0 - - - docean-plugin-config - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-config + diff --git a/jcommon/docean-plugin/docean-plugin-configuration/pom.xml b/jcommon/docean-plugin/docean-plugin-configuration/pom.xml index 1575af2e9..49345c7a3 100644 --- a/jcommon/docean-plugin/docean-plugin-configuration/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-configuration/pom.xml @@ -1,28 +1,23 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-configuration - - - 8 - 8 - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - compile - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-configuration + + 8 + 8 + + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + compile + + + diff --git a/jcommon/docean-plugin/docean-plugin-datasource-serverless/pom.xml b/jcommon/docean-plugin/docean-plugin-datasource-serverless/pom.xml index f2743fef2..fe323b51c 100644 --- a/jcommon/docean-plugin/docean-plugin-datasource-serverless/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-datasource-serverless/pom.xml @@ -1,29 +1,22 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-datasource-serverless - - - 8 - 8 - - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-datasource-serverless + + 8 + 8 + + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-datasource/pom.xml b/jcommon/docean-plugin/docean-plugin-datasource/pom.xml index af473c29a..1cf7c14a2 100644 --- a/jcommon/docean-plugin/docean-plugin-datasource/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-datasource/pom.xml @@ -1,68 +1,52 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-datasource - - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - com.mchange - c3p0 - 0.9.5.2 - - - - mysql - mysql-connector-java - 5.1.46 - - - - run.mone - http - 1.4-SNAPSHOT - compile - - - - run.mone - common - 1.7.2-SNAPSHOT - compile - - - - com.zaxxer - HikariCP - 4.0.3 - provided - - - - - com.alibaba - druid - 1.2.5 - provided - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-datasource + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + com.mchange + c3p0 + 0.9.5.2 + + + mysql + mysql-connector-java + 5.1.46 + + + run.mone + http + 1.4-jdk20-SNAPSHOT + compile + + + run.mone + common + 1.7.2-jdk20-SNAPSHOT + compile + + + com.zaxxer + HikariCP + 4.0.3 + provided + + + com.alibaba + druid + 1.2.5 + provided + + + diff --git a/jcommon/docean-plugin/docean-plugin-db/pom.xml b/jcommon/docean-plugin/docean-plugin-db/pom.xml index be7838d39..7d20afb33 100644 --- a/jcommon/docean-plugin/docean-plugin-db/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-db/pom.xml @@ -1,52 +1,39 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-db - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-datasource - 1.4-SNAPSHOT - - - - - run.mone - nutz - 1.r.68-open-SNAPSHOT - compile - - - - com.mchange - c3p0 - 0.9.5.2 - - - - mysql - mysql-connector-java - 5.1.46 - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-db + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-datasource + 1.4-jdk20-SNAPSHOT + + + run.mone + nutz + 1.r.68-open-SNAPSHOT + compile + + + com.mchange + c3p0 + 0.9.5.2 + + + mysql + mysql-connector-java + 5.1.46 + + + diff --git a/jcommon/docean-plugin/docean-plugin-dmesh/pom.xml b/jcommon/docean-plugin/docean-plugin-dmesh/pom.xml index 202184724..245b8fb16 100644 --- a/jcommon/docean-plugin/docean-plugin-dmesh/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-dmesh/pom.xml @@ -1,59 +1,57 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-dmesh - - - - - - run.mone - docean - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-api - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - run.mone - rcurve - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-mybatis - 1.4-SNAPSHOT - provided - - - - - run.mone - docean-plugin-db - 1.4-SNAPSHOT - provided - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-dmesh + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + run.mone + docean + 1.4-SNAPSHOT + + + run.mone + docean-plugin-api + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + run.mone + rcurve + 1.4-SNAPSHOT + + + run.mone + docean-plugin-mybatis + 1.4-SNAPSHOT + provided + + + run.mone + docean-plugin-db + 1.4-jdk20-SNAPSHOT + provided + + + diff --git a/jcommon/docean-plugin/docean-plugin-dubbo-serverless/pom.xml b/jcommon/docean-plugin/docean-plugin-dubbo-serverless/pom.xml index 3084b73b5..223eb070d 100644 --- a/jcommon/docean-plugin/docean-plugin-dubbo-serverless/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-dubbo-serverless/pom.xml @@ -1,55 +1,43 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-dubbo-serverless - - - 8 - 8 - - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - run.mone - dubbo - 2.7.0-mone-serverless-v15-SNAPSHOT - - - com.xiaomi.youpin - youpin-infra-rpc - - - - - - - run.mone - nacos-client - 1.2.1-mone-v3-SNAPSHOT - - - - run.mone - dubbo-registry-nacos - 1.2.1-mone-SNAPSHOT - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-dubbo-serverless + + 8 + 8 + + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + run.mone + dubbo + 2.7.0-mone-serverless-v15-SNAPSHOT + + + youpin-infra-rpc + com.xiaomi.youpin + + + + + run.mone + nacos-client + 1.2.1-mone-v3-SNAPSHOT + + + run.mone + dubbo-registry-nacos + 1.2.1-mone-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-dubbo/pom.xml b/jcommon/docean-plugin/docean-plugin-dubbo/pom.xml index d060acb2e..638eeea1e 100644 --- a/jcommon/docean-plugin/docean-plugin-dubbo/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-dubbo/pom.xml @@ -1,45 +1,34 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - docean-plugin-dubbo - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - run.mone - dubbo - 2.7.12-mone-v8-SNAPSHOT - provided - - - - - run.mone - nacos-client - 1.2.1-mone-v3-SNAPSHOT - - - - run.mone - dubbo-registry-nacos - 1.2.1-mone-SNAPSHOT - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-dubbo + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + run.mone + dubbo + 2.7.12-mone-v8-SNAPSHOT + provided + + + run.mone + nacos-client + 1.2.1-mone-v3-SNAPSHOT + + + run.mone + dubbo-registry-nacos + 1.2.1-mone-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-es-antlr4/pom.xml b/jcommon/docean-plugin/docean-plugin-es-antlr4/pom.xml index 5433ceb08..85cb70b96 100644 --- a/jcommon/docean-plugin/docean-plugin-es-antlr4/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-es-antlr4/pom.xml @@ -1,60 +1,52 @@ - - 4.0.0 - - run.mone - docean-plugin - 1.4-SNAPSHOT - - - docean-plugin-es-antlr4 - - - 8 - 8 - UTF-8 - - - - - org.antlr - antlr4-runtime - 4.12.0 - - - - run.mone - es - 1.4-SNAPSHOT - compile - - - - - - - - org.antlr - antlr4-maven-plugin - 4.12.0 - - - antlr - - antlr4 - - none - - - - src/test/java - true - true - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-es-antlr4 + + UTF-8 + 8 + 8 + + + + org.antlr + antlr4-runtime + 4.12.0 + + + run.mone + es + 1.4-SNAPSHOT + compile + + + + + + org.antlr + antlr4-maven-plugin + 4.12.0 + + + antlr + none + + antlr4 + + + + + src/test/java + true + true + + + + + diff --git a/jcommon/docean-plugin/docean-plugin-es/pom.xml b/jcommon/docean-plugin/docean-plugin-es/pom.xml index 7b1736038..032313bd2 100644 --- a/jcommon/docean-plugin/docean-plugin-es/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-es/pom.xml @@ -1,29 +1,24 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-es - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - run.mone - es - 1.4-SNAPSHOT - compile - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-es + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + run.mone + es + 1.5-jdk20-SNAPSHOT + compile + + + diff --git a/jcommon/docean-plugin/docean-plugin-etcd/pom.xml b/jcommon/docean-plugin/docean-plugin-etcd/pom.xml index f8b283f23..255dfead6 100644 --- a/jcommon/docean-plugin/docean-plugin-etcd/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-etcd/pom.xml @@ -1,33 +1,23 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-etcd - - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - io.etcd - jetcd-core - 0.5.10 - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-etcd + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + io.etcd + jetcd-core + 0.5.10 + + + diff --git a/jcommon/docean-plugin/docean-plugin-grpc/pom.xml b/jcommon/docean-plugin/docean-plugin-grpc/pom.xml index 924b74ceb..f55c317d1 100644 --- a/jcommon/docean-plugin/docean-plugin-grpc/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-grpc/pom.xml @@ -1,45 +1,33 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-grpc - - - - - io.grpc - grpc-netty - 1.34.1 - - - - io.grpc - grpc-protobuf - 1.34.1 - - - - io.grpc - grpc-stub - 1.34.1 - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-grpc + + + io.grpc + grpc-netty + 1.34.1 + + + io.grpc + grpc-protobuf + 1.34.1 + + + io.grpc + grpc-stub + 1.34.1 + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-http-server/pom.xml b/jcommon/docean-plugin/docean-plugin-http-server/pom.xml index d03dbab13..0b811a0fc 100644 --- a/jcommon/docean-plugin/docean-plugin-http-server/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-http-server/pom.xml @@ -1,30 +1,27 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-http-server - - - 8 - 8 - - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-http-server + + 8 + 8 + + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + run.mone + docean + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-http/pom.xml b/jcommon/docean-plugin/docean-plugin-http/pom.xml index bb58915c6..d5d842f81 100644 --- a/jcommon/docean-plugin/docean-plugin-http/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-http/pom.xml @@ -1,15 +1,11 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-http - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-http + diff --git a/jcommon/docean-plugin/docean-plugin-influxdb/pom.xml b/jcommon/docean-plugin/docean-plugin-influxdb/pom.xml index a290a4e75..8a00a904c 100644 --- a/jcommon/docean-plugin/docean-plugin-influxdb/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-influxdb/pom.xml @@ -1,42 +1,23 @@ - - - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-influxdb - - - org.influxdb - influxdb-java - 2.12 - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-influxdb + + + org.influxdb + influxdb-java + 2.12 + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-json/pom.xml b/jcommon/docean-plugin/docean-plugin-json/pom.xml index bd0abed54..2f799d4d3 100644 --- a/jcommon/docean-plugin/docean-plugin-json/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-json/pom.xml @@ -1,29 +1,18 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-json - - - - - - - org.antlr - antlr4-runtime - 4.7.1 - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-json + + + org.antlr + antlr4-runtime + 4.7.1 + + + diff --git a/jcommon/docean-plugin/docean-plugin-k8s/pom.xml b/jcommon/docean-plugin/docean-plugin-k8s/pom.xml index ff20bc779..4562b60e8 100644 --- a/jcommon/docean-plugin/docean-plugin-k8s/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-k8s/pom.xml @@ -1,41 +1,33 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-k8s - - - 8 - 8 - 5.11.2 - - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - io.fabric8 - kubernetes-client - ${version.fabric8.client} - - - io.kubernetes - client-java - 15.0.1 - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-k8s + + 8 + 5.11.2 + 8 + + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + io.fabric8 + kubernetes-client + ${version.fabric8.client} + + + io.kubernetes + client-java + 15.0.1 + + + diff --git a/jcommon/docean-plugin/docean-plugin-log/pom.xml b/jcommon/docean-plugin/docean-plugin-log/pom.xml index be9fc300c..144362d37 100644 --- a/jcommon/docean-plugin/docean-plugin-log/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-log/pom.xml @@ -1,34 +1,23 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-log - - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - com.lmax - disruptor - 3.4.2 - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-log + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + com.lmax + disruptor + 3.4.2 + + + diff --git a/jcommon/docean-plugin/docean-plugin-mesh-dubbo/pom.xml b/jcommon/docean-plugin/docean-plugin-mesh-dubbo/pom.xml index a5c272ee6..bb9529711 100644 --- a/jcommon/docean-plugin/docean-plugin-mesh-dubbo/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-mesh-dubbo/pom.xml @@ -1,20 +1,16 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-mesh-dubbo - - - 8 - 8 - UTF-8 - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-mesh-dubbo + + UTF-8 + 8 + 8 + + diff --git a/jcommon/docean-plugin/docean-plugin-mongodb/pom.xml b/jcommon/docean-plugin/docean-plugin-mongodb/pom.xml index 4eedd4e56..34f0a8396 100644 --- a/jcommon/docean-plugin/docean-plugin-mongodb/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-mongodb/pom.xml @@ -1,34 +1,28 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-mongodb - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - org.mongodb - mongo-java-driver - 3.8.0 - - - - run.mone - catPlugin - 1.4-SNAPSHOT - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-mongodb + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + org.mongodb + mongo-java-driver + 3.8.0 + + + run.mone + catPlugin + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-mvc/pom.xml b/jcommon/docean-plugin/docean-plugin-mvc/pom.xml index 1b08751ed..32773fe1e 100644 --- a/jcommon/docean-plugin/docean-plugin-mvc/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-mvc/pom.xml @@ -1,26 +1,18 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-mvc - - - - - run.mone - docean-plugin-nacos - 1.4-SNAPSHOT - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-mvc + + + run.mone + docean-plugin-nacos + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-mybatis-plus/pom.xml b/jcommon/docean-plugin/docean-plugin-mybatis-plus/pom.xml index ce8409614..9ff84cf46 100644 --- a/jcommon/docean-plugin/docean-plugin-mybatis-plus/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-mybatis-plus/pom.xml @@ -1,64 +1,52 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-mybatis-plus - - - - run.mone - docean-plugin-datasource - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-cat - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - com.mchange - c3p0 - 0.9.5.2 - - - com.baomidou - mybatis-plus - 3.4.3.3 - - - com.baomidou - mybatis-plus-generator - 3.4.1 - - - org.freemarker - freemarker - 2.3.31 - - - - - - - - - - 8 - 8 - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-mybatis-plus + + 8 + 8 + + + + run.mone + docean-plugin-datasource + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-cat + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + com.mchange + c3p0 + 0.9.5.2 + + + com.baomidou + mybatis-plus + 3.4.3.3 + + + com.baomidou + mybatis-plus-generator + 3.4.1 + + + org.freemarker + freemarker + 2.3.31 + + + diff --git a/jcommon/docean-plugin/docean-plugin-mybatis/pom.xml b/jcommon/docean-plugin/docean-plugin-mybatis/pom.xml index 9c0db205f..6ec75d217 100644 --- a/jcommon/docean-plugin/docean-plugin-mybatis/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-mybatis/pom.xml @@ -1,83 +1,51 @@ - - - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - docean-plugin-mybatis - 1.4.8-SNAPSHOT - - - - - com.alibaba - druid - 1.2.15 - provided - - - run.mone - docean-plugin-datasource - 1.4-SNAPSHOT - provided - - - - run.mone - docean-plugin-cat - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - org.mybatis - mybatis - 3.4.6 - - - - - - - - - - org.freemarker - freemarker - 2.3.31 - - - - com.github.pagehelper - pagehelper - 5.3.0 - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-mybatis + 1.4.8-jdk20-SNAPSHOT + + + com.alibaba + druid + 1.2.15 + provided + + + run.mone + docean-plugin-datasource + 1.4-jdk20-SNAPSHOT + provided + + + run.mone + docean-plugin-cat + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + org.mybatis + mybatis + 3.4.6 + + + org.freemarker + freemarker + 2.3.31 + + + com.github.pagehelper + pagehelper + 5.3.0 + + + diff --git a/jcommon/docean-plugin/docean-plugin-nacos/pom.xml b/jcommon/docean-plugin/docean-plugin-nacos/pom.xml index 8abfe75ed..bd87309df 100644 --- a/jcommon/docean-plugin/docean-plugin-nacos/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-nacos/pom.xml @@ -1,32 +1,23 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-nacos - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - - run.mone - nacos-client - 1.2.1-mone-v3-SNAPSHOT - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-nacos + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + run.mone + nacos-client + 1.2.1-mone-v3-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-redis/pom.xml b/jcommon/docean-plugin/docean-plugin-redis/pom.xml index cc42394fb..ea847443a 100644 --- a/jcommon/docean-plugin/docean-plugin-redis/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-redis/pom.xml @@ -1,41 +1,35 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-redis - - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - - redis.clients - jedis - 2.9.0 - - - - org.springframework - spring-context - 5.0.6.RELEASE - provided - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-redis + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + redis.clients + jedis + 2.9.0 + + + org.springframework + spring-context + 5.0.6.RELEASE + provided + + + diff --git a/jcommon/docean-plugin/docean-plugin-rocketmq/pom.xml b/jcommon/docean-plugin/docean-plugin-rocketmq/pom.xml index 0ed6c872f..8d738804a 100644 --- a/jcommon/docean-plugin/docean-plugin-rocketmq/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-rocketmq/pom.xml @@ -1,43 +1,34 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - 1.4.1-SNAPSHOT - - docean-plugin-rocketmq - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - com.alibaba - fastjson - 1.2.77 - - - - org.apache.rocketmq - rocketmq-acl - 4.9.4 - - - - org.apache.rocketmq - rocketmq-client - 4.9.4 - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-rocketmq + 1.4.1-jdk20-SNAPSHOT + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + com.alibaba + fastjson + 1.2.77 + + + org.apache.rocketmq + rocketmq-acl + 4.9.4 + + + org.apache.rocketmq + rocketmq-client + 4.9.4 + + + diff --git a/jcommon/docean-plugin/docean-plugin-rpc/pom.xml b/jcommon/docean-plugin/docean-plugin-rpc/pom.xml index 2ac41ebfa..16ec0e0fc 100644 --- a/jcommon/docean-plugin/docean-plugin-rpc/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-rpc/pom.xml @@ -1,36 +1,27 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-rpc - - - 8 - 8 - - - - - - - run.mone - rpc - 1.7-SNAPSHOT - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-rpc + + 8 + 8 + + + + run.mone + rpc + 1.7-jdk20-SNAPSHOT + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-sentinel/pom.xml b/jcommon/docean-plugin/docean-plugin-sentinel/pom.xml index 36b1ebb19..afb4d7ff5 100644 --- a/jcommon/docean-plugin/docean-plugin-sentinel/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-sentinel/pom.xml @@ -1,38 +1,28 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-sentinel - - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - run.mone - sentinel-transport-simple-http - 1.8.2.1-mone-SNAPSHOT - - - - run.mone - sentinel-datasource-nacos - 1.8.2.1-mone-SNAPSHOT - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-sentinel + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + run.mone + sentinel-transport-simple-http + 1.8.2.1-mone-SNAPSHOT + + + run.mone + sentinel-datasource-nacos + 1.8.2.1-mone-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-shardingSphere/pom.xml b/jcommon/docean-plugin/docean-plugin-shardingSphere/pom.xml index 6ccee1b78..2f1bd0628 100644 --- a/jcommon/docean-plugin/docean-plugin-shardingSphere/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-shardingSphere/pom.xml @@ -1,79 +1,49 @@ - - - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-shardingSphere - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-datasource - 1.4-SNAPSHOT - - - - - run.mone - nutz - 1.r.68-open-SNAPSHOT - compile - - - - com.mchange - c3p0 - 0.9.5.2 - - - - mysql - mysql-connector-java - 5.1.46 - - - - - org.apache.shardingsphere - sharding-jdbc-core - 4.1.0 - - - com.zaxxer - HikariCP-java7 - 2.4.11 - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-shardingSphere + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-datasource + 1.4-jdk20-SNAPSHOT + + + run.mone + nutz + 1.r.68-open-SNAPSHOT + compile + + + com.mchange + c3p0 + 0.9.5.2 + + + mysql + mysql-connector-java + 5.1.46 + + + org.apache.shardingsphere + sharding-jdbc-core + 4.1.0 + + + com.zaxxer + HikariCP-java7 + 2.4.11 + + + diff --git a/jcommon/docean-plugin/docean-plugin-sidecar/pom.xml b/jcommon/docean-plugin/docean-plugin-sidecar/pom.xml index 5632b5643..86dc31f19 100644 --- a/jcommon/docean-plugin/docean-plugin-sidecar/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-sidecar/pom.xml @@ -1,56 +1,46 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - ../../pom.xml - - 4.0.0 - - docean-plugin-sidecar - 1.4.2-SNAPSHOT - - - 8 - 8 - - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - run.mone - rcurve - 1.4.2-SNAPSHOT - - - - run.mone - grpc - 1.4-SNAPSHOT - - - run.mone - api - - - - - - run.mone - infra-result - 1.4-SNAPSHOT - provided - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + ../../pom.xml + + docean-plugin-sidecar + 1.4.2-jdk20-SNAPSHOT + + 8 + 8 + + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + run.mone + rcurve + 1.4.2-SNAPSHOT + + + run.mone + grpc + 1.4-jdk20-SNAPSHOT + + + api + run.mone + + + + + run.mone + infra-result + 1.4-jdk20-SNAPSHOT + provided + + + diff --git a/jcommon/docean-plugin/docean-plugin-spring/pom.xml b/jcommon/docean-plugin/docean-plugin-spring/pom.xml index 08aca1d9f..9b9670c1c 100644 --- a/jcommon/docean-plugin/docean-plugin-spring/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-spring/pom.xml @@ -1,19 +1,24 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-spring + + 8 + 8 + - docean-plugin-spring + + + javax.annotation + javax.annotation-api + 1.3.2 + - - 8 - 8 - - - \ No newline at end of file + + diff --git a/jcommon/docean-plugin/docean-plugin-sql/pom.xml b/jcommon/docean-plugin/docean-plugin-sql/pom.xml index dfa1ce757..dc7244d44 100644 --- a/jcommon/docean-plugin/docean-plugin-sql/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-sql/pom.xml @@ -1,35 +1,28 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-sql - - - - - run.mone - docean-plugin-api - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-datasource - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-sql + + + run.mone + docean-plugin-api + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-datasource + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/docean-plugin/docean-plugin-test/pom.xml b/jcommon/docean-plugin/docean-plugin-test/pom.xml index 6988a8e92..318e75249 100644 --- a/jcommon/docean-plugin/docean-plugin-test/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-test/pom.xml @@ -1,189 +1,143 @@ - - - docean-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin-test - - - - - run.mone - docean - 1.4-SNAPSHOT - - - - org.msgpack - msgpack - 0.6.12 - - - - run.mone - docean-plugin-api - 1.4-SNAPSHOT - - - - - run.mone - docean-plugin-config - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-db - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-spring - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-rpc - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-dubbo - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-nacos - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-http - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-rocketmq - 1.4.1-SNAPSHOT - - - - run.mone - docean-plugin-sql - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-aop - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-json - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-redis - 1.4-SNAPSHOT - - - - - run.mone - docean-plugin-mybatis - 1.4-SNAPSHOT - - - - - run.mone - docean-plugin-datasource - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-log - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-mvc - 1.4-SNAPSHOT - - - - - run.mone - docean-plugin-dmesh - 1.4-SNAPSHOT - - - - - run.mone - docean-plugin-sidecar - 1.4-SNAPSHOT - - - - run.mone - docean-plugin-http-server - 1.4-SNAPSHOT - - - - - - - - - - - - org.mybatis.generator - mybatis-generator-maven-plugin - 1.3.2 - - true - true - - - - - - - mysql - mysql-connector-java - 5.1.47 - - - - - - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + docean-plugin + 1.4-jdk20-SNAPSHOT + + docean-plugin-test + + + run.mone + docean + 1.4-SNAPSHOT + + + org.msgpack + msgpack + 0.6.12 + + + run.mone + docean-plugin-api + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-config + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-db + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-spring + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-rpc + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-dubbo + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-nacos + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-http + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-rocketmq + 1.4.1-jdk20-SNAPSHOT + + + run.mone + docean-plugin-sql + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-aop + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-json + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-redis + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-mybatis + 1.4-SNAPSHOT + + + run.mone + docean-plugin-datasource + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-log + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-mvc + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-dmesh + 1.4-jdk20-SNAPSHOT + + + run.mone + docean-plugin-sidecar + 1.4-SNAPSHOT + + + run.mone + docean-plugin-http-server + 1.4-jdk20-SNAPSHOT + + + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.2 + + + mysql + mysql-connector-java + 5.1.47 + + + + true + true + + + + + diff --git a/jcommon/docean-plugin/pom.xml b/jcommon/docean-plugin/pom.xml index 0ac5109bf..e66643554 100644 --- a/jcommon/docean-plugin/pom.xml +++ b/jcommon/docean-plugin/pom.xml @@ -1,67 +1,58 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docean-plugin - 1.4-SNAPSHOT - pom - - docean-plugin-aop - docean-plugin-db - docean-plugin-shardingSphere - docean-plugin-config - docean-plugin-dubbo - docean-plugin-http - docean-plugin-json - docean-plugin-nacos - docean-plugin-redis - docean-plugin-rocketmq - docean-plugin-sql - docean-plugin-test - docean-plugin-sentinel - docean-plugin-mybatis - docean-plugin-mybatis-plus - docean-plugin-datasource - docean-plugin-mongodb - docean-plugin-log - docean-plugin-cat - docean-plugin-mvc - docean-plugin-dmesh - docean-plugin-akka - docean-plugin-api - docean-plugin-es - docean-plugin-etcd - docean-plugin-grpc - docean-plugin-dubbo-serverless - docean-plugin-datasource-serverless - docean-plugin-rpc - docean-plugin-k8s - docean-plugin-spring - docean-plugin-configuration - docean-plugin-http-server - docean-plugin-classloader - docean-plugin-mesh-dubbo - docean-plugin-es-antlr4 - - - - - - run.mone - docean - 1.4-SNAPSHOT - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + docean-plugin + 1.4-jdk20-SNAPSHOT + pom + + docean-plugin-aop + docean-plugin-db + docean-plugin-shardingSphere + docean-plugin-config + docean-plugin-dubbo + docean-plugin-http + docean-plugin-json + docean-plugin-nacos + docean-plugin-redis + docean-plugin-rocketmq + docean-plugin-sql + docean-plugin-test + docean-plugin-sentinel + docean-plugin-mybatis + docean-plugin-mybatis-plus + docean-plugin-datasource + docean-plugin-mongodb + docean-plugin-log + docean-plugin-cat + docean-plugin-mvc + docean-plugin-dmesh + docean-plugin-akka + docean-plugin-api + docean-plugin-es + docean-plugin-etcd + docean-plugin-grpc + docean-plugin-dubbo-serverless + docean-plugin-datasource-serverless + docean-plugin-rpc + docean-plugin-k8s + docean-plugin-spring + docean-plugin-configuration + docean-plugin-http-server + docean-plugin-classloader + docean-plugin-mesh-dubbo + docean-plugin-es-antlr4 + + + + run.mone + docean + 1.4-SNAPSHOT + + + diff --git a/jcommon/docean/pom.xml b/jcommon/docean/pom.xml index dfa8f4aa1..86378317b 100644 --- a/jcommon/docean/pom.xml +++ b/jcommon/docean/pom.xml @@ -1,93 +1,71 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - 1.4-java20-SNAPSHOT - - docean - - - 4.1.97.Final - - - - - - - run.mone - easy - 1.4-SNAPSHOT - - - - cglib - cglib-nodep - 3.3.0 - - - - io.netty - netty-all - ${netty.version} - - - - com.google.code.gson - gson - 2.8.5 - - - - com.squareup.okhttp3 - okhttp - 4.10.0 - test - - - - javax.annotation - javax.annotation-api - 1.3.2 - - - javax.activation - activation - 1.1 - compile - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - - --add-modules=jdk.incubator.concurrent - --enable-preview - - 20 - 20 - 20 - - - - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + docean + 1.4-jdk20-SNAPSHOT + + 4.1.97.Final + + + + run.mone + easy + 1.4-jdk20-SNAPSHOT + + + cglib + cglib-nodep + 3.3.0 + + + io.netty + netty-all + ${netty.version} + + + com.google.code.gson + gson + 2.8.5 + + + com.squareup.okhttp3 + okhttp + 4.10.0 + test + + + javax.annotation + javax.annotation-api + 1.3.2 + + + javax.activation + activation + 1.1 + compile + + + + + + maven-compiler-plugin + 3.11.0 + + + --add-modules=jdk.incubator.concurrent + --enable-preview + + 20 + 20 + 20 + + + + + diff --git a/jcommon/docker/pom.xml b/jcommon/docker/pom.xml index 8251117ee..03b0c6894 100644 --- a/jcommon/docker/pom.xml +++ b/jcommon/docker/pom.xml @@ -1,57 +1,41 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - docker - 1.6-SNAPSHOT - - - - - - com.kohlschutter.junixsocket - junixsocket-common - 2.4.0 - - - - com.kohlschutter.junixsocket - junixsocket-native-common - 2.4.0 - - - - - - com.github.docker-java - docker-java - 3.1.5 - - - * - io.netty - - - - - - - junit - junit - 4.12 - test - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + docker + 1.6-jdk20-SNAPSHOT + + + com.kohlschutter.junixsocket + junixsocket-common + 2.4.0 + + + com.kohlschutter.junixsocket + junixsocket-native-common + 2.4.0 + + + com.github.docker-java + docker-java + 3.1.5 + + + * + io.netty + + + + + junit + junit + 4.12 + test + + + diff --git a/jcommon/easy/pom.xml b/jcommon/easy/pom.xml index d6fac5dc9..96afb7742 100644 --- a/jcommon/easy/pom.xml +++ b/jcommon/easy/pom.xml @@ -1,28 +1,19 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - easy - - - - - - cglib - cglib-nodep - 3.3.0 - provided - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + easy + + + cglib + cglib-nodep + 3.3.0 + provided + + + diff --git a/jcommon/es/pom.xml b/jcommon/es/pom.xml index 5870b2676..b03ef7a44 100644 --- a/jcommon/es/pom.xml +++ b/jcommon/es/pom.xml @@ -1,120 +1,101 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - es - 1.5-SNAPSHOT - - - - - org.elasticsearch.client - elasticsearch-rest-high-level-client - 7.10.0 - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.apache.httpcomponents - httpcore-nio - - - - - org.elasticsearch.client - elasticsearch-rest-client-sniffer - 7.10.0 - - - org.apache.httpcomponents - httpclient - 4.5.12 - - - org.apache.httpcomponents - httpcore-nio - 4.4.13 - - - org.apache.httpcomponents - httpcore - 4.4.13 - - - - run.mone - nacos - 1.4-v1-SNAPSHOT - test - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 1.8 - 1.8 - - true - UTF-8 - - - ${project.basedir}/src/main/java - - - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1 - - true - - - - compile - - jar - - - - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + es + 1.5-jdk20-SNAPSHOT + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + 7.10.0 + + + httpclient + org.apache.httpcomponents + + + httpcore + org.apache.httpcomponents + + + httpcore-nio + org.apache.httpcomponents + + + + + org.elasticsearch.client + elasticsearch-rest-client-sniffer + 7.10.0 + + + org.apache.httpcomponents + httpclient + 4.5.12 + + + org.apache.httpcomponents + httpcore-nio + 4.4.13 + + + org.apache.httpcomponents + httpcore + 4.4.13 + + + run.mone + nacos + 1.4-v1-jdk20-SNAPSHOT + test + + + + + + maven-compiler-plugin + 3.10.1 + + 1.8 + 1.8 + true + UTF-8 + + ${project.basedir}/src/main/java + + + + + maven-source-plugin + 2.1 + + + compile + + jar + + + + + true + + + + diff --git a/jcommon/event/pom.xml b/jcommon/event/pom.xml index 7622f3bed..d72927f1a 100644 --- a/jcommon/event/pom.xml +++ b/jcommon/event/pom.xml @@ -1,27 +1,22 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - event - - - 8 - 8 - - - - - com.google.guava - guava - 22.0 - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + event + + 8 + 8 + + + + com.google.guava + guava + 22.0 + + + diff --git a/jcommon/excel/pom.xml b/jcommon/excel/pom.xml index ed22aa09b..f48fdec10 100644 --- a/jcommon/excel/pom.xml +++ b/jcommon/excel/pom.xml @@ -1,47 +1,42 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - excel - - - 8 - 8 - - - - - org.apache.poi - poi - 3.14 - - - org.apache.poi - poi-ooxml - 3.14 - - - org.apache.poi - poi-contrib - 3.6 - - - org.apache.poi - poi-ooxml-schemas - 3.17 - - - org.apache.poi - poi-scratchpad - 3.17 - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + excel + + 8 + 8 + + + + org.apache.poi + poi + 3.14 + + + org.apache.poi + poi-ooxml + 3.14 + + + org.apache.poi + poi-contrib + 3.6 + + + org.apache.poi + poi-ooxml-schemas + 3.17 + + + org.apache.poi + poi-scratchpad + 3.17 + + + diff --git a/jcommon/feishu/pom.xml b/jcommon/feishu/pom.xml index 355a8db88..8f72e4ea7 100644 --- a/jcommon/feishu/pom.xml +++ b/jcommon/feishu/pom.xml @@ -1,34 +1,25 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - feishu - - - - run.mone - http - 1.4-SNAPSHOT - compile - - - - run.mone - nacos - 1.4-v1-SNAPSHOT - test - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + feishu + + + run.mone + http + 1.4-jdk20-SNAPSHOT + compile + + + run.mone + nacos + 1.4-v1-jdk20-SNAPSHOT + test + + + diff --git a/jcommon/file/pom.xml b/jcommon/file/pom.xml index dc6e96e39..e35dca653 100644 --- a/jcommon/file/pom.xml +++ b/jcommon/file/pom.xml @@ -1,15 +1,11 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - file - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + file + diff --git a/jcommon/geth/pom.xml b/jcommon/geth/pom.xml index f17866d56..0255dbb3f 100644 --- a/jcommon/geth/pom.xml +++ b/jcommon/geth/pom.xml @@ -1,45 +1,33 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - geth - - - 8 - 8 - 3.2.0 - - - - - - org.web3j - core - ${geth.version} - - - - org.web3j - geth - ${geth.version} - - - - - org.web3j - parity - ${geth.version} - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + geth + + 8 + 3.2.0 + 8 + + + + org.web3j + core + ${geth.version} + + + org.web3j + geth + ${geth.version} + + + org.web3j + parity + ${geth.version} + + + diff --git a/jcommon/gitlab/pom.xml b/jcommon/gitlab/pom.xml index e56dcb4d6..aef3c0d1d 100644 --- a/jcommon/gitlab/pom.xml +++ b/jcommon/gitlab/pom.xml @@ -1,55 +1,46 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - gitlab - 1.6-SNAPSHOT - - - - com.github.odiszapc - nginxparser - 0.9.3 - - - http - run.mone - 1.4-SNAPSHOT - - - - org.apache.commons - commons-lang3 - 3.8.1 - - - - - org.eclipse.jgit - org.eclipse.jgit - 5.1.3.201810200350-r - compile - - - - org.gitlab4j - gitlab4j-api - 4.12.2 - - - commons-io - commons-io - 2.6 - compile - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + gitlab + 1.6-jdk20-SNAPSHOT + + + com.github.odiszapc + nginxparser + 0.9.3 + + + run.mone + http + 1.4-jdk20-SNAPSHOT + + + org.apache.commons + commons-lang3 + 3.8.1 + + + org.eclipse.jgit + org.eclipse.jgit + 5.1.3.201810200350-r + compile + + + org.gitlab4j + gitlab4j-api + 4.12.2 + + + commons-io + commons-io + 2.6 + compile + + + diff --git a/jcommon/graalvm/pom.xml b/jcommon/graalvm/pom.xml index ddf667b7f..1771ec947 100644 --- a/jcommon/graalvm/pom.xml +++ b/jcommon/graalvm/pom.xml @@ -1,181 +1,72 @@ - - - run.mone - 4.0.0 - 1.4-SNAPSHOT - - graalvm - - - - - - - - - - - org.projectlombok - lombok - 1.18.4 - provided - - - - org.graalvm.sdk - graal-sdk - 21.0.0.2 - provided - - - - - ch.qos.logback - logback-classic - 1.1.2 - - - - ch.qos.logback - logback-core - 1.1.2 - - - - - - - - - - - run.mone - docean - 1.4-SNAPSHOT - - - - - io.projectreactor.netty - reactor-netty - 0.9.20.RELEASE - compile - - - - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - central - maven-release-virtual - https://pkgs.d.xiaomi.net/artifactory/maven-release-virtual - - - snapshots - maven-snapshot-virtual - https://pkgs.d.xiaomi.net/artifactory/maven-snapshot-virtual - - - - - \ No newline at end of file + + 4.0.0 + run.mone + graalvm + 1.4-jdk20-SNAPSHOT + + + central + maven-release-virtual + https://pkgs.d.xiaomi.net/artifactory/maven-release-virtual + + + snapshots + maven-snapshot-virtual + https://pkgs.d.xiaomi.net/artifactory/maven-snapshot-virtual + + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + org.projectlombok + lombok + 1.18.28 + provided + + + org.graalvm.sdk + graal-sdk + 21.0.0.2 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + + + ch.qos.logback + logback-core + 1.1.2 + + + run.mone + docean + 1.4-SNAPSHOT + + + io.projectreactor.netty + reactor-netty + 0.9.20.RELEASE + compile + + + + + + maven-compiler-plugin + + 8 + 8 + + + + + diff --git a/jcommon/grpc/pom.xml b/jcommon/grpc/pom.xml index 740973220..e08a05607 100644 --- a/jcommon/grpc/pom.xml +++ b/jcommon/grpc/pom.xml @@ -1,51 +1,44 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - grpc - - - - - - run.mone - api - 1.4-SNAPSHOT - - - - io.grpc - grpc-netty - 1.38.0 - - - - io.grpc - grpc-protobuf - 1.38.0 - - - - io.grpc - grpc-stub - 1.38.0 - - - - io.grpc - grpc-services - 1.38.0 - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + grpc + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + run.mone + api + 1.4-SNAPSHOT + + + io.grpc + grpc-netty + 1.38.0 + + + io.grpc + grpc-protobuf + 1.38.0 + + + io.grpc + grpc-stub + 1.38.0 + + + io.grpc + grpc-services + 1.38.0 + + + diff --git a/jcommon/health/pom.xml b/jcommon/health/pom.xml index 7d2ab84f1..56aa6531d 100644 --- a/jcommon/health/pom.xml +++ b/jcommon/health/pom.xml @@ -1,57 +1,40 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - health - - - - - - - run.mone - nacos - 1.4-v1-SNAPSHOT - - - - org.springframework - spring-web - 5.1.2.RELEASE - provided - - - - - run.mone - dubbo - 2.7.12-mone-v8-SNAPSHOT - provided - - - - - run.mone - struct - 1.4.1-SNAPSHOT - - - - - run.mone - aop - 1.4-SNAPSHOT - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + health + + + run.mone + nacos + 1.4-v1-jdk20-SNAPSHOT + + + org.springframework + spring-web + 5.1.2.RELEASE + provided + + + run.mone + dubbo + 2.7.12-mone-v8-SNAPSHOT + provided + + + run.mone + struct + 1.4.1-jdk20-SNAPSHOT + + + run.mone + aop + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/hera/hera-trace/pom.xml b/jcommon/hera/hera-trace/pom.xml index 2c2ccd8b2..0cf983252 100644 --- a/jcommon/hera/hera-trace/pom.xml +++ b/jcommon/hera/hera-trace/pom.xml @@ -1,15 +1,11 @@ - - - hera - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - hera-trace - - - \ No newline at end of file + + 4.0.0 + + run.mone + hera + 1.4-jdk20-SNAPSHOT + + hera-trace + diff --git a/jcommon/hera/pom.xml b/jcommon/hera/pom.xml index dce463c1a..21e44d88c 100644 --- a/jcommon/hera/pom.xml +++ b/jcommon/hera/pom.xml @@ -1,19 +1,15 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - hera - pom - - hera-trace - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + hera + pom + + hera-trace + + diff --git a/jcommon/http/pom.xml b/jcommon/http/pom.xml index 51f861073..323207c3d 100644 --- a/jcommon/http/pom.xml +++ b/jcommon/http/pom.xml @@ -1,39 +1,29 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - http - - - - - org.apache.httpcomponents - httpclient - 4.5.5 - - - - io.netty - netty-all - 4.1.36.Final - - - - com.squareup.okhttp3 - okhttp - 4.11.0 - provided - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + http + + + org.apache.httpcomponents + httpclient + 4.5.5 + + + io.netty + netty-all + 4.1.36.Final + + + com.squareup.okhttp3 + okhttp + 4.11.0 + provided + + + diff --git a/jcommon/infra-common/pom.xml b/jcommon/infra-common/pom.xml index 1f60d6bda..cdd4e930d 100644 --- a/jcommon/infra-common/pom.xml +++ b/jcommon/infra-common/pom.xml @@ -1,18 +1,14 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - infra-common - - - UTF-8 - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + infra-common + + UTF-8 + + diff --git a/jcommon/infra-result/pom.xml b/jcommon/infra-result/pom.xml index 25beb4e42..98b418cc5 100644 --- a/jcommon/infra-result/pom.xml +++ b/jcommon/infra-result/pom.xml @@ -1,31 +1,25 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - infra-result - - - - - org.projectlombok - lombok - 1.18.4 - provided - - - - junit - junit - 4.12 - test - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + infra-result + + + org.projectlombok + lombok + 1.18.28 + provided + + + junit + junit + 4.12 + test + + + diff --git a/jcommon/jmonitor/pom.xml b/jcommon/jmonitor/pom.xml index 1d52927f2..b4c308cdb 100644 --- a/jcommon/jmonitor/pom.xml +++ b/jcommon/jmonitor/pom.xml @@ -1,30 +1,14 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - jmonitor - - - - - - com.sun - tools - 1.8 - system - ${java.home}/../lib/tools.jar - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + jmonitor + + + + diff --git a/jcommon/k8s/pom.xml b/jcommon/k8s/pom.xml index 2817d3398..bf82263ec 100644 --- a/jcommon/k8s/pom.xml +++ b/jcommon/k8s/pom.xml @@ -1,36 +1,29 @@ - - - - jcommon - run.mone - 1.4-SNAPSHOT - - - 4.0.0 - - k8s - - - 8 - 8 - - - - - - io.kubernetes - client-java-extended - 10.0.1 - - - - - org.junit.jupiter - junit-jupiter - RELEASE - test - - - + + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + + k8s + + 8 + 8 + + + + io.kubernetes + client-java-extended + 10.0.1 + + + org.junit.jupiter + junit-jupiter + RELEASE + test + + diff --git a/jcommon/ks3/pom.xml b/jcommon/ks3/pom.xml index cb7dc63e0..efb33c588 100644 --- a/jcommon/ks3/pom.xml +++ b/jcommon/ks3/pom.xml @@ -1,41 +1,35 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + ks3 + + + javax.annotation + javax.annotation-api + 1.3.2 + - ks3 - - - - - com.ksyun - ks3-kss-java-sdk - 0.8.11 - - - - - - - jackson-databind - com.fasterxml.jackson.core - - - - - - - run.mone - http - 1.4-SNAPSHOT - - - - - \ No newline at end of file + + com.ksyun + ks3-kss-java-sdk + 0.8.11 + + + jackson-databind + com.fasterxml.jackson.core + + + + + run.mone + http + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/log/pom.xml b/jcommon/log/pom.xml index 541284b13..6b67feda9 100644 --- a/jcommon/log/pom.xml +++ b/jcommon/log/pom.xml @@ -1,64 +1,51 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - - - 4.0.0 - - log - 1.7-SNAPSHOT - - - - - com.lmax - disruptor - 3.4.2 - - - - ch.qos.logback - logback-classic - 1.1.2 - provided - - - - ch.qos.logback - logback-core - 1.1.2 - provided - - - - run.mone - dubbo - 2.7.12-mone-v8-SNAPSHOT - - - netty - org.jboss.netty - - - log4j - log4j - - - commons-logging - commons-logging - - - provided - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + log + 1.7-jdk20-SNAPSHOT + + + com.lmax + disruptor + 3.4.2 + + + ch.qos.logback + logback-classic + 1.1.2 + provided + + + ch.qos.logback + logback-core + 1.1.2 + provided + + + run.mone + dubbo + 2.7.12-mone-v8-SNAPSHOT + provided + + + netty + org.jboss.netty + + + log4j + log4j + + + commons-logging + commons-logging + + + + + diff --git a/jcommon/match/pom.xml b/jcommon/match/pom.xml index 46d8741db..7d422d40a 100644 --- a/jcommon/match/pom.xml +++ b/jcommon/match/pom.xml @@ -1,31 +1,23 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - match - - - 8 - 8 - UTF-8 - - - - - - - com.gliwka.hyperscan - hyperscan - 5.4.0-2.0.0 - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + match + + UTF-8 + 8 + 8 + + + + com.gliwka.hyperscan + hyperscan + 5.4.0-2.0.0 + + + diff --git a/jcommon/micloud/pom.xml b/jcommon/micloud/pom.xml index 4595ee924..bb446ca5f 100644 --- a/jcommon/micloud/pom.xml +++ b/jcommon/micloud/pom.xml @@ -1,50 +1,44 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - micloud - 1.4.1-SNAPSHOT - - - - run.mone - http - 1.4-SNAPSHOT - - - com.fasterxml.jackson.core - jackson-annotations - 2.11.0 - - - com.fasterxml.jackson.core - jackson-databind - 2.11.0 - - - com.squareup.okhttp3 - okhttp - 4.10.0 - - - org.apache.logging.log4j - log4j-core - 2.17.0 - - - org.apache.logging.log4j - log4j-api - 2.17.0 - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + micloud + 1.4.1-jdk20-SNAPSHOT + + + run.mone + http + 1.4-jdk20-SNAPSHOT + + + com.fasterxml.jackson.core + jackson-annotations + 2.11.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.11.0 + + + com.squareup.okhttp3 + okhttp + 4.10.0 + + + org.apache.logging.log4j + log4j-core + 2.17.0 + + + org.apache.logging.log4j + log4j-api + 2.17.0 + + + diff --git a/jcommon/mistarter/pom.xml b/jcommon/mistarter/pom.xml index 90bad7912..f0388b14a 100644 --- a/jcommon/mistarter/pom.xml +++ b/jcommon/mistarter/pom.xml @@ -1,48 +1,36 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - mistarter - 1.6-SNAPSHOT - - - - - - run.mone - aop - 1.4-SNAPSHOT - - - - org.springframework.boot - spring-boot-autoconfigure - 2.2.0.RELEASE - provided - - - - - run.mone - health - 1.4-SNAPSHOT - - - - run.mone - dubbo - 2.7.12-mone-v8-SNAPSHOT - provided - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + mistarter + 1.6-jdk20-SNAPSHOT + + + run.mone + aop + 1.4-jdk20-SNAPSHOT + + + org.springframework.boot + spring-boot-autoconfigure + 2.2.0.RELEASE + provided + + + run.mone + health + 1.4-jdk20-SNAPSHOT + + + run.mone + dubbo + 2.7.12-mone-v8-SNAPSHOT + provided + + + diff --git a/jcommon/monespring/pom.xml b/jcommon/monespring/pom.xml index ad57bb9b0..54868ed05 100644 --- a/jcommon/monespring/pom.xml +++ b/jcommon/monespring/pom.xml @@ -1,35 +1,25 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - monespring - - - - - org.springframework.boot - spring-boot-starter-web - 2.0.2.RELEASE - provided - - - - - run.mone - dubbo - 2.7.12-mone-v8-SNAPSHOT - provided - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + monespring + + + org.springframework.boot + spring-boot-starter-web + 2.0.2.RELEASE + provided + + + run.mone + dubbo + 2.7.12-mone-v8-SNAPSHOT + provided + + + diff --git a/jcommon/mongodb/pom.xml b/jcommon/mongodb/pom.xml index ea168dc0d..cb278d940 100644 --- a/jcommon/mongodb/pom.xml +++ b/jcommon/mongodb/pom.xml @@ -1,29 +1,29 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + mongodb + + + javax.annotation + javax.annotation-api + 1.3.2 + - mongodb - - - - org.mongodb - mongo-java-driver - 3.8.0 - - - - run.mone - catPlugin - 1.4-SNAPSHOT - - - - - \ No newline at end of file + + org.mongodb + mongo-java-driver + 3.8.0 + + + run.mone + catPlugin + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/monitor/pom.xml b/jcommon/monitor/pom.xml index a277d174a..9bcef8e34 100644 --- a/jcommon/monitor/pom.xml +++ b/jcommon/monitor/pom.xml @@ -1,24 +1,18 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - monitor - - - - - run.mone - http - 1.4-SNAPSHOT - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + monitor + + + run.mone + http + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/mquic/pom.xml b/jcommon/mquic/pom.xml index c78b74c2a..9cdf9c14a 100644 --- a/jcommon/mquic/pom.xml +++ b/jcommon/mquic/pom.xml @@ -1,51 +1,35 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - mquic - - - - - - - io.netty.incubator - netty-incubator-codec-quic - 0.0.14.Final - osx-x86_64 - - - - - org.projectlombok - lombok - 1.18.4 - provided - - - - ch.qos.logback - logback-classic - 1.1.2 - - - - ch.qos.logback - logback-core - 1.1.2 - - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + mquic + + + io.netty.incubator + netty-incubator-codec-quic + 0.0.14.Final + osx-x86_64 + + + org.projectlombok + lombok + 1.18.28 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + + + ch.qos.logback + logback-core + 1.1.2 + + + diff --git a/jcommon/mv-plugin/codecheck-maven-plugin/pom.xml b/jcommon/mv-plugin/codecheck-maven-plugin/pom.xml index d247d96cb..710901cab 100644 --- a/jcommon/mv-plugin/codecheck-maven-plugin/pom.xml +++ b/jcommon/mv-plugin/codecheck-maven-plugin/pom.xml @@ -1,29 +1,30 @@ - + + + 4.0.0 - mv-plugin run.mone - 1.4-SNAPSHOT + mv-plugin + 1.4-jdk20-SNAPSHOT - 4.0.0 - codecheck-maven-plugin maven-plugin - codecheck-maven-plugin Maven Plugin - - http://maven.apache.org - UTF-8 - run.mone codecheck - 1.4-SNAPSHOT + 1.4-jdk20-SNAPSHOT + + + tools + com.sun + + org.apache.maven @@ -47,16 +48,13 @@ test - - org.apache.maven.plugins maven-plugin-plugin 3.5.2 - org.apache.maven.plugins maven-compiler-plugin 3.8.1 @@ -64,9 +62,7 @@ 1.8 UTF-8 - - ${project.basedir}/src/main/java - + ${project.basedir}/src/main/java diff --git a/jcommon/mv-plugin/jarcheck-maven-plugin/pom.xml b/jcommon/mv-plugin/jarcheck-maven-plugin/pom.xml index 842518a0f..5ff4f9d27 100644 --- a/jcommon/mv-plugin/jarcheck-maven-plugin/pom.xml +++ b/jcommon/mv-plugin/jarcheck-maven-plugin/pom.xml @@ -1,75 +1,65 @@ - - 4.0.0 - - run.mone - mv-plugin - 1.4-SNAPSHOT - - - jarcheck-maven-plugin - maven-plugin - - jarcheck-maven-plugin Maven Plugin - - - http://maven.apache.org - - - UTF-8 - - - - - org.apache.maven - maven-core - 3.9.0 - - - org.apache.maven - maven-plugin-api - 3.5.2 - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.5.2 - - - org.codehaus.plexus - plexus-utils - 3.0.8 - - - junit - junit - 4.8.2 - test - - - - - - - org.apache.maven.plugins - maven-plugin-plugin - 3.5.2 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - UTF-8 - - - ${project.basedir}/src/main/java - - - - - - + + + 4.0.0 + + run.mone + mv-plugin + 1.4-jdk20-SNAPSHOT + + jarcheck-maven-plugin + maven-plugin + jarcheck-maven-plugin Maven Plugin + http://maven.apache.org + + UTF-8 + + + + org.apache.maven + maven-core + 3.9.0 + + + org.apache.maven + maven-plugin-api + 3.5.2 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.5.2 + + + org.codehaus.plexus + plexus-utils + 3.0.8 + + + junit + junit + 4.8.2 + test + + + + + + maven-plugin-plugin + 3.5.2 + + + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + UTF-8 + + ${project.basedir}/src/main/java + + + + + diff --git a/jcommon/mv-plugin/mesh-plugin/pom.xml b/jcommon/mv-plugin/mesh-plugin/pom.xml deleted file mode 100644 index 22204f8b5..000000000 --- a/jcommon/mv-plugin/mesh-plugin/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - jcommon - run.mone - 1.4-SNAPSHOT - - - 4.0.0 - - mesh-plugin - maven-plugin - - - 8 - 8 - UTF-8 - - - - - - - org.apache.maven - maven-plugin-api - 3.5.4 - - - - org.apache.maven - maven-core - 3.5.4 - provided - - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.5.2 - provided - - - - - - - - - org.apache.maven.plugins - maven-plugin-plugin - 3.5.2 - - - - - \ No newline at end of file diff --git a/jcommon/mv-plugin/mesh-plugin/src/main/java/run/mone/mesh/plugin/MeshMojo.java b/jcommon/mv-plugin/mesh-plugin/src/main/java/run/mone/mesh/plugin/MeshMojo.java deleted file mode 100644 index 628ef82c3..000000000 --- a/jcommon/mv-plugin/mesh-plugin/src/main/java/run/mone/mesh/plugin/MeshMojo.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2020 Xiaomi - * - * 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 run.mone.mesh.plugin; - -import lombok.SneakyThrows; -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.logging.Log; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.project.MavenProject; - -/** - * @author goodjava@qq.com - * 用来生成mesh包的(有点类似于api包相对于dubbo) - */ -@Mojo(name = "mesh") -public class MeshMojo extends AbstractMojo { - - @SneakyThrows - @Override - public void execute() { - Log log = getLog(); - log.info("mesh jar mojo execute"); - MavenProject project = (MavenProject) this.getPluginContext().get("project"); - log.info("project:" + project); - } - - -} diff --git a/jcommon/mv-plugin/mv-demo/pom.xml b/jcommon/mv-plugin/mv-demo/pom.xml index a9f111f92..45a4dd95b 100644 --- a/jcommon/mv-plugin/mv-demo/pom.xml +++ b/jcommon/mv-plugin/mv-demo/pom.xml @@ -1,58 +1,24 @@ - - - mv-plugin - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - mv-demo - - - - - - run.mone - dubbo - 2.7.12-mone-v8-SNAPSHOT - - - - io.grpc - grpc-api - 1.31.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + mv-plugin + 1.4-jdk20-SNAPSHOT + + mv-demo + + + run.mone + dubbo + 2.7.12-mone-v8-SNAPSHOT + + + io.grpc + grpc-api + 1.31.1 + + + + diff --git a/jcommon/mv-plugin/native-plugin/pom.xml b/jcommon/mv-plugin/native-plugin/pom.xml index 1bcc1e401..813cad17b 100644 --- a/jcommon/mv-plugin/native-plugin/pom.xml +++ b/jcommon/mv-plugin/native-plugin/pom.xml @@ -1,83 +1,65 @@ - - - mv-plugin - run.mone - 1.4-SNAPSHOT - - - 4.0.0 - native-plugin - maven-plugin - - - - - - org.apache.maven - maven-plugin-api - 3.5.4 - - - - org.apache.maven - maven-core - 3.5.4 - provided - - - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.5.2 - provided - - - - run.mone - dubbo - 2.7.12-mone-v8-SNAPSHOT - - - - - commons-io - commons-io - 2.6 - - - - - - - - - - maven-plugin-plugin - 3.6.0 - - - default-addPluginArtifactMetadata - package - - addPluginArtifactMetadata - - - - default-descriptor - process-classes - - descriptor - - - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + mv-plugin + 1.4-jdk20-SNAPSHOT + + native-plugin + maven-plugin + + + org.apache.maven + maven-plugin-api + 3.5.4 + + + org.apache.maven + maven-core + 3.5.4 + provided + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.5.2 + provided + + + run.mone + dubbo + 2.7.12-mone-v8-SNAPSHOT + + + commons-io + commons-io + 2.6 + + + + + + maven-plugin-plugin + 3.6.0 + + + default-addPluginArtifactMetadata + package + + addPluginArtifactMetadata + + + + default-descriptor + process-classes + + descriptor + + + + + + + diff --git a/jcommon/mv-plugin/pom.xml b/jcommon/mv-plugin/pom.xml index ccf1bdae8..08979e4b9 100644 --- a/jcommon/mv-plugin/pom.xml +++ b/jcommon/mv-plugin/pom.xml @@ -1,22 +1,18 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - mv-plugin - pom - - native-plugin - mv-demo - codecheck-maven-plugin - jarcheck-maven-plugin - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + mv-plugin + pom + + native-plugin + mv-demo + codecheck-maven-plugin + jarcheck-maven-plugin + + diff --git a/jcommon/mybatis-plugins/pom.xml b/jcommon/mybatis-plugins/pom.xml index b0840cd5f..c134fa912 100644 --- a/jcommon/mybatis-plugins/pom.xml +++ b/jcommon/mybatis-plugins/pom.xml @@ -1,23 +1,19 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - mybatis-plugins - - - - org.mybatis - mybatis - 3.5.9 - provided - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + mybatis-plugins + + + org.mybatis + mybatis + 3.5.9 + provided + + + diff --git a/jcommon/nacos/pom.xml b/jcommon/nacos/pom.xml index 54366b141..b86449d6f 100644 --- a/jcommon/nacos/pom.xml +++ b/jcommon/nacos/pom.xml @@ -1,32 +1,30 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + nacos + 1.4-v1-jdk20-SNAPSHOT + + + javax.annotation + javax.annotation-api + 1.3.2 + - nacos - 1.4-v1-SNAPSHOT - - - - - run.mone - nacos-client - 1.2.1-mone-v3-SNAPSHOT - - - - run.mone - http - 1.4-SNAPSHOT - - - - - - \ No newline at end of file + + run.mone + nacos-client + 1.2.1-mone-v3-SNAPSHOT + + + run.mone + http + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/nginx/pom.xml b/jcommon/nginx/pom.xml index a6ee78670..31bdcd299 100644 --- a/jcommon/nginx/pom.xml +++ b/jcommon/nginx/pom.xml @@ -1,32 +1,24 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - nginx - 1.4-SNAPSHOT - - - - - org.apache.commons - commons-lang3 - 3.7 - - - - - com.github.odiszapc - nginxparser - 0.9.3 - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + nginx + 1.4-jdk20-SNAPSHOT + + + org.apache.commons + commons-lang3 + 3.7 + + + com.github.odiszapc + nginxparser + 0.9.3 + + + diff --git a/jcommon/openai/pom.xml b/jcommon/openai/pom.xml index 44a0430c7..50c3ea8f8 100644 --- a/jcommon/openai/pom.xml +++ b/jcommon/openai/pom.xml @@ -1,66 +1,49 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - openai - - - 8 - 8 - - - - - - - - org.apache.httpcomponents - httpclient - 4.5.12 - - - - com.alibaba - fastjson - 1.2.70 - - - - com.unfbx - chatgpt-java - 1.0.6 - - - - org.apache.commons - commons-math3 - 3.6.1 - - - - - ch.qos.logback - logback-classic - 1.1.2 - test - - - - ch.qos.logback - logback-core - 1.1.2 - test - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + openai + + 8 + 8 + + + + org.apache.httpcomponents + httpclient + 4.5.12 + + + com.alibaba + fastjson + 1.2.70 + + + com.unfbx + chatgpt-java + 1.0.6 + + + org.apache.commons + commons-math3 + 3.6.1 + + + ch.qos.logback + logback-classic + 1.1.2 + test + + + ch.qos.logback + logback-core + 1.1.2 + test + + + diff --git a/jcommon/pom.xml b/jcommon/pom.xml index 8531d05af..f591a6520 100644 --- a/jcommon/pom.xml +++ b/jcommon/pom.xml @@ -1,255 +1,208 @@ - - 4.0.0 - - run.mone - jcommon - pom - 1.4-SNAPSHOT - - - 8 - 8 - - ~/ - - - ${project.artifactId} - The parent project of jcommon - https://github.com/XiaoMi/mone - 2020 - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - - - - - aliyun - log - common - annotation - antlr - rpc - redis - http - monitor - struct - gitlab - api - nacos - mongodb - coloregg - ks3 - test - docker - codegen - jmonitor - codecheck - cron - nginx - dbLocking - aop - crypto - catPlugin - feishu - sre - mistarter - health - docean - rcurve - micloud - docean-plugin - ssh - es - file - k8s - grpc - easy - df - monespring - graalvm - mquic - prometheus - buddy - hera - mv-plugin - teambition - spider - disruptor - pool - raft - event - geth - docean-plugin/docean-plugin-sidecar - sidecar-api - schedule - infra-result - mv-plugin/mesh-plugin - rpc-codes - mybatis-plugins - processor - openai - excel - match - infra-common - - - - - - junit - junit - 4.12 - test - - - - com.google.code.gson - gson - 2.8.5 - - - - org.projectlombok - lombok - 1.18.28 - provided - - - - - ch.qos.logback - logback-classic - 1.1.2 - provided - - - - ch.qos.logback - logback-core - 1.1.2 - provided - - - - com.google.guava - guava - 25.1-jre - - - - org.springframework - spring-core - 5.0.6.RELEASE - provided - - - - org.springframework - spring-context - 5.0.6.RELEASE - provided - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - copy-license - prepare-package - - copy-resources - - - target/classes/META-INF - - - ${maven.jcommonDirectory} - - LICENSE.txt - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 1.8 - 1.8 - - true - UTF-8 - - - ${project.basedir}/src/main/java - - - - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.1 - - true - - - - compile - - jar - - - - - - - - - - - - - - - - - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - + + 4.0.0 + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + pom + ${project.artifactId} + The parent project of jcommon + https://github.com/XiaoMi/mone + 2020 + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + repo + + + + aliyun + log + common + annotation + antlr + rpc + redis + http + monitor + struct + gitlab + api + nacos + mongodb + coloregg + ks3 + test + docker + codegen + jmonitor + codecheck + cron + nginx + dbLocking + aop + crypto + catPlugin + feishu + sre + mistarter + health + docean + rcurve + micloud + docean-plugin + ssh + es + file + k8s + grpc + easy + df + monespring + graalvm + mquic + prometheus + buddy + hera + mv-plugin + teambition + spider + disruptor + pool + raft + event + geth + docean-plugin/docean-plugin-sidecar + sidecar-api + schedule + infra-result + rpc-codes + mybatis-plugins + processor + openai + excel + match + infra-common + + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + + ~/ + 8 + 8 + + + + junit + junit + 4.12 + test + + + com.google.code.gson + gson + 2.8.5 + + + org.projectlombok + lombok + 1.18.28 + provided + + + ch.qos.logback + logback-classic + 1.1.2 + provided + + + ch.qos.logback + logback-core + 1.1.2 + provided + + + com.google.guava + guava + 25.1-jre + + + org.springframework + spring-core + 5.0.6.RELEASE + provided + + + org.springframework + spring-context + 5.0.6.RELEASE + provided + + + + + + maven-resources-plugin + 3.2.0 + + + copy-license + prepare-package + + copy-resources + + + target/classes/META-INF + + + ${maven.jcommonDirectory} + + LICENSE.txt + + + + + + + + + maven-compiler-plugin + 3.10.1 + + 1.8 + 1.8 + true + UTF-8 + + ${project.basedir}/src/main/java + + + + + maven-source-plugin + 2.1 + + + compile + + jar + + + + + true + + + + diff --git a/jcommon/pool/pom.xml b/jcommon/pool/pom.xml index b94f6637e..fcd3c22ec 100644 --- a/jcommon/pool/pom.xml +++ b/jcommon/pool/pom.xml @@ -1,40 +1,28 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - pool - - - - 8 - 8 - 4.1.97.Final - - - - - - org.apache.commons - commons-pool2 - 2.11.1 - - - - io.netty - netty-all - ${netty.version} - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + pool + + 8 + 4.1.97.Final + 8 + + + + org.apache.commons + commons-pool2 + 2.11.1 + + + io.netty + netty-all + ${netty.version} + + + diff --git a/jcommon/processor/pom.xml b/jcommon/processor/pom.xml index 0ffff770a..0f877341e 100644 --- a/jcommon/processor/pom.xml +++ b/jcommon/processor/pom.xml @@ -1,73 +1,47 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - processor - - - 8 - 8 - UTF-8 - - - - - - - com.sun - tools - 1.8 - system - ${java.home}/../lib/tools.jar - - - - com.squareup - javapoet - 1.13.0 - - - - com.github.javaparser - javaparser-core - 3.23.1 - - - - com.google.guava - guava - 25.1-jre - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 1.8 - 1.8 - UTF-8 - -proc:none - - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + processor + + UTF-8 + 8 + 8 + + + + com.squareup + javapoet + 1.13.0 + + + com.github.javaparser + javaparser-core + 3.23.1 + + + com.google.guava + guava + 25.1-jre + + + + + + maven-compiler-plugin + 3.10.1 + + 1.8 + 1.8 + UTF-8 + -proc:none + + + + + diff --git a/jcommon/prometheus/pom.xml b/jcommon/prometheus/pom.xml index 4a8e6a7f4..86011a281 100644 --- a/jcommon/prometheus/pom.xml +++ b/jcommon/prometheus/pom.xml @@ -1,53 +1,43 @@ - - - run.mone - jcommon - 1.4-SNAPSHOT - - - 4.0.0 - prometheus - pom - 0.0.6-SNAPSHOT - - prometheus-client - prometheus-sql - prometheus-dubbo - prometheus-redis - prometheus-starter - prometheus-metrics - prometheus-trace-etl - - - - 1.8 - 0.0.6-SNAPSHOT - - - - - - io.prometheus - simpleclient - 0.10.0 - - - - io.prometheus - simpleclient_hotspot - 0.10.0 - - - - io.prometheus - simpleclient_common - 0.10.0 - - - - - + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + prometheus + 0.0.6-jdk20-SNAPSHOT + pom + + prometheus-client + prometheus-sql + prometheus-dubbo + prometheus-redis + prometheus-starter + prometheus-metrics + prometheus-trace-etl + + + 1.8 + 0.0.6-jdk20-SNAPSHOT + + + + io.prometheus + simpleclient + 0.10.0 + + + io.prometheus + simpleclient_hotspot + 0.10.0 + + + io.prometheus + simpleclient_common + 0.10.0 + + diff --git a/jcommon/prometheus/prometheus-client/pom.xml b/jcommon/prometheus/prometheus-client/pom.xml index ee3005850..20e010113 100644 --- a/jcommon/prometheus/prometheus-client/pom.xml +++ b/jcommon/prometheus/prometheus-client/pom.xml @@ -5,7 +5,7 @@ prometheus run.mone - 0.0.6-SNAPSHOT + 0.0.6-jdk20-SNAPSHOT 4.0.0 diff --git a/jcommon/prometheus/prometheus-dubbo/pom.xml b/jcommon/prometheus/prometheus-dubbo/pom.xml index e4425785c..8606b8960 100644 --- a/jcommon/prometheus/prometheus-dubbo/pom.xml +++ b/jcommon/prometheus/prometheus-dubbo/pom.xml @@ -1,32 +1,26 @@ - - - prometheus - run.mone - 0.0.5-SNAPSHOT - - 4.0.0 - - dubbo-filter - ${prometheus-all.version} - - - - - run.mone - dubbo - 2.7.12-mone-v8-SNAPSHOT - provided - - - - run.mone - prometheus-client - ${prometheus-all.version} - provided - - - + + 4.0.0 + + run.mone + prometheus + 0.0.6-jdk20-SNAPSHOT + + dubbo-filter + ${prometheus-all.version} + + + run.mone + dubbo + 2.7.12-mone-v8-SNAPSHOT + provided + + + run.mone + prometheus-client + ${prometheus-all.version} + provided + + diff --git a/jcommon/prometheus/prometheus-metrics/pom.xml b/jcommon/prometheus/prometheus-metrics/pom.xml index e86c497e0..82a647ab9 100644 --- a/jcommon/prometheus/prometheus-metrics/pom.xml +++ b/jcommon/prometheus/prometheus-metrics/pom.xml @@ -1,29 +1,25 @@ - - - prometheus - run.mone - 0.0.6-SNAPSHOT - - 4.0.0 - - prometheus-metrics - ${prometheus-all.version} - - - - run.mone - prometheus-client - ${prometheus-all.version} - - - org.aspectj - aspectjrt - 1.8.4 - compile - - - - \ No newline at end of file + + 4.0.0 + + run.mone + prometheus + 0.0.6-jdk20-SNAPSHOT + + prometheus-metrics + ${prometheus-all.version} + + + run.mone + prometheus-client + ${prometheus-all.version} + + + org.aspectj + aspectjrt + 1.8.4 + compile + + + diff --git a/jcommon/prometheus/prometheus-redis/pom.xml b/jcommon/prometheus/prometheus-redis/pom.xml index 4119ee4e7..3c77cfd0c 100644 --- a/jcommon/prometheus/prometheus-redis/pom.xml +++ b/jcommon/prometheus/prometheus-redis/pom.xml @@ -1,55 +1,43 @@ - - - prometheus - run.mone - 0.0.6-SNAPSHOT - - - 4.0.0 - - prometheus-redis - ${prometheus-all.version} - - - - - redis.clients - jedis - 2.9.0 - - - - run.mone - prometheus-client - ${prometheus-all.version} - - - - org.springframework - spring-context - 5.0.6.RELEASE - provided - - - - org.aspectj - aspectjweaver - 1.8.12 - provided - - - - org.springframework.boot - spring-boot-starter-data-redis - 2.1.2.RELEASE - provided - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + prometheus + 0.0.6-jdk20-SNAPSHOT + + + prometheus-redis + ${prometheus-all.version} + + + redis.clients + jedis + 2.9.0 + + + run.mone + prometheus-client + ${prometheus-all.version} + + + org.springframework + spring-context + 5.0.6.RELEASE + provided + + + org.aspectj + aspectjweaver + 1.8.12 + provided + + + org.springframework.boot + spring-boot-starter-data-redis + 2.1.2.RELEASE + provided + + + diff --git a/jcommon/prometheus/prometheus-sql/pom.xml b/jcommon/prometheus/prometheus-sql/pom.xml index a3451e247..56ea053bf 100644 --- a/jcommon/prometheus/prometheus-sql/pom.xml +++ b/jcommon/prometheus/prometheus-sql/pom.xml @@ -1,39 +1,31 @@ - - - prometheus - run.mone - 0.0.6-SNAPSHOT - - 4.0.0 - - prometheus-sql - ${prometheus-all.version} - - - - - org.mybatis - mybatis - 3.4.6 - provided - - - - run.mone - prometheus-client - ${prometheus-all.version} - - - org.projectlombok - lombok - 1.18.4 - compile - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + prometheus + 0.0.6-jdk20-SNAPSHOT + + prometheus-sql + ${prometheus-all.version} + + + org.mybatis + mybatis + 3.4.6 + provided + + + run.mone + prometheus-client + ${prometheus-all.version} + + + org.projectlombok + lombok + 1.18.28 + compile + + + diff --git a/jcommon/prometheus/prometheus-starter/pom.xml b/jcommon/prometheus/prometheus-starter/pom.xml index e36197b05..9e632db04 100644 --- a/jcommon/prometheus/prometheus-starter/pom.xml +++ b/jcommon/prometheus/prometheus-starter/pom.xml @@ -1,34 +1,31 @@ - - - prometheus - run.mone - 0.0.6-SNAPSHOT - - 4.0.0 - - prometheus-starter - ${prometheus-all.version} - - - - - org.springframework.boot - spring-boot-autoconfigure - 2.2.0.RELEASE - provided - - - - run.mone - prometheus-metrics - ${prometheus-all.version} - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + prometheus + 0.0.6-jdk20-SNAPSHOT + + prometheus-starter + ${prometheus-all.version} + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + org.springframework.boot + spring-boot-autoconfigure + 2.2.0.RELEASE + provided + + + run.mone + prometheus-metrics + ${prometheus-all.version} + + + diff --git a/jcommon/prometheus/prometheus-trace-etl/pom.xml b/jcommon/prometheus/prometheus-trace-etl/pom.xml index 0fbbebc21..0ca544d3b 100644 --- a/jcommon/prometheus/prometheus-trace-etl/pom.xml +++ b/jcommon/prometheus/prometheus-trace-etl/pom.xml @@ -6,7 +6,7 @@ run.mone prometheus - 0.0.6-SNAPSHOT + 0.0.6-jdk20-SNAPSHOT prometheus-trace-etl diff --git a/jcommon/raft/pom.xml b/jcommon/raft/pom.xml index 8cb990456..34b6fbf85 100644 --- a/jcommon/raft/pom.xml +++ b/jcommon/raft/pom.xml @@ -1,110 +1,85 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - raft - - - 8 - 8 - - - - - - run.mone - rpc - 1.7-SNAPSHOT - - - - org.springframework.boot - spring-boot-starter-web - 2.1.2.RELEASE - - - - org.springframework.boot - spring-boot-starter-test - 2.1.2.RELEASE - - - - org.apache.commons - commons-lang3 - 3.7 - - - - org.apache.commons - commons-io - 1.3.2 - - - - com.google.code.gson - gson - 2.8.6 - - - - org.projectlombok - lombok - 1.18.20 - provided - - - - - com.alibaba - fastjson - 1.2.76 - - - - com.ning - async-http-client - 1.7.17 - - - - org.springframework - spring-web - 5.1.3.RELEASE - provided - - - - org.apache.tomcat.embed - tomcat-embed-core - 9.0.13 - provided - - - - commons-collections - commons-collections - 3.2.2 - - - - org.apache.httpcomponents - httpclient - 4.5.12 - - - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + raft + + 8 + 8 + + + + run.mone + rpc + 1.7-jdk20-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-web + 2.1.2.RELEASE + + + org.springframework.boot + spring-boot-starter-test + 2.1.2.RELEASE + + + org.apache.commons + commons-lang3 + 3.7 + + + org.apache.commons + commons-io + 1.3.2 + + + com.google.code.gson + gson + 2.8.6 + + + org.projectlombok + lombok + 1.18.28 + provided + + + com.alibaba + fastjson + 1.2.76 + + + com.ning + async-http-client + 1.7.17 + + + org.springframework + spring-web + 5.1.3.RELEASE + provided + + + org.apache.tomcat.embed + tomcat-embed-core + 9.0.13 + provided + + + commons-collections + commons-collections + 3.2.2 + + + org.apache.httpcomponents + httpclient + 4.5.12 + + + diff --git a/jcommon/rcurve/pom.xml b/jcommon/rcurve/pom.xml index dc790a1ed..16beb4b39 100644 --- a/jcommon/rcurve/pom.xml +++ b/jcommon/rcurve/pom.xml @@ -1,93 +1,62 @@ - - - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - rcurve - 1.4.2-jdk20-SNAPSHOT - - - - run.mone - hera-trace - 1.4-SNAPSHOT - - - - io.protostuff - protostuff-core - 1.8.0 - - - - run.mone - api - 1.4.1-SNAPSHOT - - - - run.mone - rpc-codes - 1.4-SNAPSHOT - - - run.mone - api - - - - - - run.mone - easy - 1.4-SNAPSHOT - - - - io.netty - netty-all - 4.1.48.Final - - - - ch.qos.logback - logback-classic - 1.1.2 - provided - - - - ch.qos.logback - logback-core - 1.1.2 - provided - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + rcurve + 1.4.2-jdk20-jdk20-SNAPSHOT + + + run.mone + hera-trace + 1.4-jdk20-SNAPSHOT + + + io.protostuff + protostuff-core + 1.8.0 + + + run.mone + api + 1.4.1-jdk20-SNAPSHOT + + + run.mone + rpc-codes + 1.4-jdk20-SNAPSHOT + + + api + run.mone + + + + + run.mone + easy + 1.4-jdk20-SNAPSHOT + + + io.netty + netty-all + 4.1.48.Final + + + ch.qos.logback + logback-classic + 1.1.2 + provided + + + ch.qos.logback + logback-core + 1.1.2 + provided + + + diff --git a/jcommon/redis/pom.xml b/jcommon/redis/pom.xml index 5b5a197b0..26f5aab50 100644 --- a/jcommon/redis/pom.xml +++ b/jcommon/redis/pom.xml @@ -1,44 +1,40 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - redis - 2.0-SNAPSHOT - - - - - redis.clients - jedis - 3.5.2 - - - - run.mone - prometheus-client - 0.0.5-SNAPSHOT - - - - com.alibaba - fastjson - 2.0.40 - - - - org.apache.commons - commons-lang3 - 3.8.1 - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + redis + 2.0-jdk20-SNAPSHOT + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + redis.clients + jedis + 3.5.2 + + + run.mone + prometheus-client + 0.0.5-SNAPSHOT + + + com.alibaba + fastjson + 2.0.40 + + + org.apache.commons + commons-lang3 + 3.8.1 + + + diff --git a/jcommon/rpc-codes/pom.xml b/jcommon/rpc-codes/pom.xml index 35ae38f7f..f230abf0a 100644 --- a/jcommon/rpc-codes/pom.xml +++ b/jcommon/rpc-codes/pom.xml @@ -1,68 +1,54 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - rpc-codes - - - 8 - 8 - UTF-8 - - - - - - - io.protostuff - protostuff-core - 1.8.0 - - - - io.protostuff - protostuff-runtime - 1.8.0 - - - - com.alibaba - hessian-lite - 3.2.13 - provided - - - - run.mone - easy - 1.4-SNAPSHOT - - - - io.netty - netty-all - 4.1.48.Final - - - - run.mone - api - 1.4-SNAPSHOT - - - - org.msgpack - msgpack-core - 0.9.3 - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + rpc-codes + + UTF-8 + 8 + 8 + + + + io.protostuff + protostuff-core + 1.8.0 + + + io.protostuff + protostuff-runtime + 1.8.0 + + + com.alibaba + hessian-lite + 3.2.13 + provided + + + run.mone + easy + 1.4-jdk20-SNAPSHOT + + + io.netty + netty-all + 4.1.48.Final + + + run.mone + api + 1.4-SNAPSHOT + + + org.msgpack + msgpack-core + 0.9.3 + + + diff --git a/jcommon/rpc/pom.xml b/jcommon/rpc/pom.xml index 6eb4a2653..996a4fcef 100644 --- a/jcommon/rpc/pom.xml +++ b/jcommon/rpc/pom.xml @@ -1,70 +1,61 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - rpc - 1.7-SNAPSHOT - - - - - - ch.qos.logback - logback-classic - 1.1.2 - - - - ch.qos.logback - logback-core - 1.1.2 - - - - io.netty - netty-all - 4.1.48.Final - - - - org.projectlombok - lombok - 1.18.4 - provided - - - - run.mone - nacos - 1.4-SNAPSHOT - - - - org.msgpack - jackson-dataformat-msgpack - 0.8.21 - - - - run.mone - easy - 1.4-SNAPSHOT - - - - run.mone - rpc-codes - 1.4-SNAPSHOT - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + rpc + 1.7-jdk20-SNAPSHOT + + + javax.annotation + javax.annotation-api + 1.3.2 + + + + ch.qos.logback + logback-classic + 1.1.2 + + + ch.qos.logback + logback-core + 1.1.2 + + + io.netty + netty-all + 4.1.48.Final + + + org.projectlombok + lombok + 1.18.28 + provided + + + run.mone + nacos + 1.4-SNAPSHOT + + + org.msgpack + jackson-dataformat-msgpack + 0.8.21 + + + run.mone + easy + 1.4-jdk20-SNAPSHOT + + + run.mone + rpc-codes + 1.4-jdk20-SNAPSHOT + + + diff --git a/jcommon/schedule/pom.xml b/jcommon/schedule/pom.xml index 154be9310..e651889f5 100644 --- a/jcommon/schedule/pom.xml +++ b/jcommon/schedule/pom.xml @@ -1,109 +1,84 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - schedule - 1.5.2-SNAPSHOT - - - - - - run.mone - feishu - 1.4-SNAPSHOT - compile - - - - run.mone - common - 1.7.1-SNAPSHOT - - - - - run.mone - annotation - 1.6.1-SNAPSHOT - - - - - run.mone - rpc - 1.7-SNAPSHOT - - - - - run.mone - redis - 1.8-SNAPSHOT - - - - run.mone - common - 1.7.2-SNAPSHOT - - - - run.mone - struct - 1.4.1-SNAPSHOT - - - - - run.mone - antlr - 1.4-SNAPSHOT - - - - org.springframework - spring-jdbc - 5.0.6.RELEASE - compile - - - - run.mone - http - 1.4-SNAPSHOT - - - - - run.mone - cron - 1.4-SNAPSHOT - - - - - - - - - - org.mybatis.generator - mybatis-generator-maven-plugin - 1.3.2 - - true - true - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + schedule + 1.5.2-jdk20-SNAPSHOT + + + run.mone + feishu + 1.4-jdk20-SNAPSHOT + compile + + + run.mone + common + 1.7.1-SNAPSHOT + + + run.mone + annotation + 1.6.1-jdk20-SNAPSHOT + + + run.mone + rpc + 1.7-jdk20-SNAPSHOT + + + run.mone + redis + 1.8-SNAPSHOT + + + run.mone + common + 1.7.2-jdk20-SNAPSHOT + + + run.mone + struct + 1.4.1-jdk20-SNAPSHOT + + + run.mone + antlr + 1.4-jdk20-SNAPSHOT + + + org.springframework + spring-jdbc + 5.0.6.RELEASE + compile + + + run.mone + http + 1.4-jdk20-SNAPSHOT + + + run.mone + cron + 1.4-jdk20-SNAPSHOT + + + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.2 + + true + true + + + + + diff --git a/jcommon/sidecar-api/pom.xml b/jcommon/sidecar-api/pom.xml index 6e54cb72f..c2d1d2ab0 100644 --- a/jcommon/sidecar-api/pom.xml +++ b/jcommon/sidecar-api/pom.xml @@ -1,24 +1,11 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - sidecar-api - - - - - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + sidecar-api + diff --git a/jcommon/spider/pom.xml b/jcommon/spider/pom.xml index 37443fb23..0023735d2 100644 --- a/jcommon/spider/pom.xml +++ b/jcommon/spider/pom.xml @@ -1,39 +1,27 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - spider - - - 8 - 8 - - - - - - - org.jsoup - jsoup - 1.14.3 - - - - org.seleniumhq.selenium - selenium-java - 4.0.0 - - - - - - - + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + spider + + 8 + 8 + + + + org.jsoup + jsoup + 1.14.3 + + + org.seleniumhq.selenium + selenium-java + 4.0.0 + + diff --git a/jcommon/sre/pom.xml b/jcommon/sre/pom.xml index 706766c97..52c577353 100644 --- a/jcommon/sre/pom.xml +++ b/jcommon/sre/pom.xml @@ -1,37 +1,24 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - sre - - - - - - - com.jcraft - jsch - 0.1.55 - - - - - org.projectlombok - lombok - 1.18.4 - provided - - - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + sre + + + com.jcraft + jsch + 0.1.55 + + + org.projectlombok + lombok + 1.18.28 + provided + + + diff --git a/jcommon/ssh/pom.xml b/jcommon/ssh/pom.xml index a35aeb2ed..6909290be 100644 --- a/jcommon/ssh/pom.xml +++ b/jcommon/ssh/pom.xml @@ -1,30 +1,23 @@ - - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - ssh - - - - - org.apache.sshd - sshd-core - 1.0.0 - - - - org.bouncycastle - bcpkix-jdk15on - 1.49 - - - - - + + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + ssh + + + org.apache.sshd + sshd-core + 1.0.0 + + + org.bouncycastle + bcpkix-jdk15on + 1.49 + + diff --git a/jcommon/struct/pom.xml b/jcommon/struct/pom.xml index 6a99c608c..ceef7979d 100644 --- a/jcommon/struct/pom.xml +++ b/jcommon/struct/pom.xml @@ -1,16 +1,12 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - struct - 1.4.1-SNAPSHOT - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + struct + 1.4.1-jdk20-SNAPSHOT + diff --git a/jcommon/teambition/pom.xml b/jcommon/teambition/pom.xml index d21b73609..8aa67ad86 100644 --- a/jcommon/teambition/pom.xml +++ b/jcommon/teambition/pom.xml @@ -1,37 +1,33 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - teambition - - - 8 - 8 - - - - run.mone - http - 1.4-SNAPSHOT - compile - - - com.auth0 - java-jwt - 3.4.0 - - - org.apache.commons - commons-lang3 - 3.8.1 - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + teambition + + 8 + 8 + + + + run.mone + http + 1.4-jdk20-SNAPSHOT + compile + + + com.auth0 + java-jwt + 3.4.0 + + + org.apache.commons + commons-lang3 + 3.8.1 + + + diff --git a/jcommon/test/pom.xml b/jcommon/test/pom.xml index da4dbec18..1edc1a951 100644 --- a/jcommon/test/pom.xml +++ b/jcommon/test/pom.xml @@ -1,61 +1,49 @@ - - - jcommon - run.mone - 1.4-SNAPSHOT - - 4.0.0 - - test - - - - - com.google.guava - guava - 25.1-jre - - - - ch.qos.logback - logback-classic - 1.1.2 - - - - ch.qos.logback - logback-core - 1.1.2 - - - - org.apache.commons - commons-lang3 - 3.7 - - - - junit - junit - 4.12 - - - org.scala-lang - scala-library - 2.10.4 - compile - - - - run.mone - processor - 1.4-SNAPSHOT - - - - - - \ No newline at end of file + + 4.0.0 + + run.mone + jcommon + 1.4-jdk20-SNAPSHOT + + test + + + com.google.guava + guava + 25.1-jre + + + ch.qos.logback + logback-classic + 1.1.2 + + + ch.qos.logback + logback-core + 1.1.2 + + + org.apache.commons + commons-lang3 + 3.7 + + + junit + junit + 4.12 + + + org.scala-lang + scala-library + 2.10.4 + compile + + + run.mone + processor + 1.4-jdk20-SNAPSHOT + + +