Skip to content

Commit

Permalink
Merge branch 'XiaoMi:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@goodjava
goodjava authored Jan 2, 2024
2 parents 1875e20 + c300b35 commit 36a5cd5
Show file tree
Hide file tree
Showing 533 changed files with 61,731 additions and 263 deletions.
2 changes: 1 addition & 1 deletion jcommon/aop/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>aop</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jcommon/buddy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.28</version>
<version>1.18.30</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jcommon/catPlugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>jcommon</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>catPlugin</artifactId>
</project>
8 changes: 4 additions & 4 deletions jcommon/codecheck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>codecheck</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>dom4j</groupId>
Expand All @@ -18,7 +18,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>infra-result</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -33,8 +33,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>20</source>
<target>20</target>
<source>21</source>
<target>21</target>
<encoding>UTF-8</encoding>
<compilerArgs>
<arg>--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
Expand Down
4 changes: 2 additions & 2 deletions jcommon/codegen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>codegen</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
Expand Down Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>infra-result</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>thrift</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jcommon/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.28</version>
<version>1.18.30</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jcommon/crypto/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.28</version>
<version>1.18.30</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion jcommon/docean-plugin/docean-plugin-akka/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-akka</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion jcommon/docean-plugin/docean-plugin-aop/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-aop</artifactId>
</project>
2 changes: 1 addition & 1 deletion jcommon/docean-plugin/docean-plugin-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-api</artifactId>
</project>
2 changes: 1 addition & 1 deletion jcommon/docean-plugin/docean-plugin-cat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-cat</artifactId>
</project>
2 changes: 1 addition & 1 deletion jcommon/docean-plugin/docean-plugin-classloader/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-classloader</artifactId>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion jcommon/docean-plugin/docean-plugin-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-config</artifactId>
</project>
4 changes: 2 additions & 2 deletions jcommon/docean-plugin/docean-plugin-configuration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-configuration</artifactId>
<properties>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-config</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jcommon/docean-plugin/docean-plugin-datasource-serverless/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-datasource-serverless</artifactId>
<properties>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-config</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions jcommon/docean-plugin/docean-plugin-datasource/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-datasource</artifactId>
<dependencies>
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-config</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mchange</groupId>
Expand Down
6 changes: 3 additions & 3 deletions jcommon/docean-plugin/docean-plugin-db/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-db</artifactId>
<dependencies>
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-config</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-datasource</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>run.mone</groupId>
Expand Down
10 changes: 5 additions & 5 deletions jcommon/docean-plugin/docean-plugin-dmesh/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-dmesh</artifactId>
<dependencies>
Expand All @@ -24,17 +24,17 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-api</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-config</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>run.mone</groupId>
Expand All @@ -50,7 +50,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-db</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jcommon/docean-plugin/docean-plugin-dubbo-serverless/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-dubbo-serverless</artifactId>
<properties>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-config</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>run.mone</groupId>
Expand Down
4 changes: 2 additions & 2 deletions jcommon/docean-plugin/docean-plugin-dubbo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-dubbo</artifactId>
<dependencies>
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-config</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>run.mone</groupId>
Expand Down
4 changes: 2 additions & 2 deletions jcommon/docean-plugin/docean-plugin-es-antlr4/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-es-antlr4</artifactId>
<properties>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>es</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-jdk21-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions jcommon/docean-plugin/docean-plugin-es/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-es</artifactId>
<dependencies>
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-config</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>run.mone</groupId>
<artifactId>es</artifactId>
<version>1.5-jdk20-SNAPSHOT</version>
<version>1.5-jdk21-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions jcommon/docean-plugin/docean-plugin-etcd/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-etcd</artifactId>
<dependencies>
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-config</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.etcd</groupId>
Expand Down
4 changes: 2 additions & 2 deletions jcommon/docean-plugin/docean-plugin-grpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-grpc</artifactId>
<dependencies>
Expand All @@ -27,7 +27,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-config</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions jcommon/docean-plugin/docean-plugin-http-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>run.mone</groupId>
<artifactId>docean-plugin</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-http-server</artifactId>
<properties>
Expand All @@ -16,12 +16,12 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-config</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit 36a5cd5

Please sign in to comment.