Skip to content

Commit

Permalink
refactor: update jdk21
Browse files Browse the repository at this point in the history
  • Loading branch information
@wtt40122
wtt40122 committed Dec 25, 2023
1 parent 856f1ca commit a3ccefb
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 30 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
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
1 change: 1 addition & 0 deletions jcommon/docean-plugin/docean-plugin-datasource/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-datasource</artifactId>
<version>1.4-jdk21-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>run.mone</groupId>
Expand Down
1 change: 1 addition & 0 deletions jcommon/docean-plugin/docean-plugin-db/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>docean-plugin-db</artifactId>
<version>1.4-jdk21-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>run.mone</groupId>
Expand Down
10 changes: 5 additions & 5 deletions jcommon/docean-spring-starter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<artifactId>jcommon</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<version>1.4-jdk21-SNAPSHOT</version>

<artifactId>docean-spring-starter</artifactId>

Expand All @@ -31,7 +32,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean</artifactId>
<version>1.4-java20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

Expand All @@ -47,12 +48,11 @@
<version>3.11.0</version>
<configuration>
<compilerArgs>
<arg>--add-modules=jdk.incubator.concurrent</arg>
<arg>--enable-preview</arg>
</compilerArgs>
<compilerVersion>20</compilerVersion>
<source>20</source>
<target>20</target>
<compilerVersion>21</compilerVersion>
<source>21</source>
<target>21</target>
</configuration>
</plugin>

Expand Down
3 changes: 2 additions & 1 deletion jcommon/health/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>health</artifactId>
<version>1.4-jdk21-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>run.mone</groupId>
Expand All @@ -34,7 +35,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>aop</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
1 change: 1 addition & 0 deletions jcommon/hera/hera-trace/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>hera-trace</artifactId>
<version>1.4-jdk21-SNAPSHOT</version>
</project>
3 changes: 2 additions & 1 deletion jcommon/infra-result/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>infra-result</artifactId>
<version>1.4-jdk21-SNAPSHOT</version>
<dependencies>
<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
6 changes: 3 additions & 3 deletions jcommon/mistarter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>mistarter</artifactId>
<version>1.6-jdk20-SNAPSHOT</version>
<version>1.6-jdk21-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>run.mone</groupId>
<artifactId>aop</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -24,7 +24,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>health</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>run.mone</groupId>
Expand Down
20 changes: 7 additions & 13 deletions jcommon/rcurve/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<version>1.4-jdk20-SNAPSHOT</version>
</parent>
<artifactId>rcurve</artifactId>
<version>1.4.2-jdk20-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>run.mone</groupId>
<artifactId>hera-trace</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.protostuff</groupId>
Expand All @@ -39,7 +39,7 @@
<dependency>
<groupId>run.mone</groupId>
<artifactId>easy</artifactId>
<version>1.4-jdk20-SNAPSHOT</version>
<version>1.4-jdk21-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Expand All @@ -49,13 +49,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.1.2</version>
<version>1.2.3</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -69,9 +63,9 @@
<compilerArgs>
<arg>--enable-preview</arg>
</compilerArgs>
<compilerVersion>20</compilerVersion>
<source>20</source>
<target>20</target>
<compilerVersion>21</compilerVersion>
<source>21</source>
<target>21</target>
</configuration>
</plugin>
</plugins>
Expand Down

0 comments on commit a3ccefb

Please sign in to comment.