This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new fb9231afb Support for building with OpenJDK 22 (#2411)
fb9231afb is described below
commit fb9231afb0d7e15a1e82f4e042cf03b5f28c83f8
Author: Ling Hengqian <[email protected]>
AuthorDate: Sun Jul 28 15:30:24 2024 +0800
Support for building with OpenJDK 22 (#2411)
---
.github/workflows/maven.yml | 2 +-
pom.xml | 6 +++---
spring/pom.xml | 29 ++---------------------------
3 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 5dfa747e4..1f9a05c46 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -28,7 +28,7 @@ jobs:
build:
strategy:
matrix:
- java: [ 8, 17, 21 ]
+ java: [ 8, 17, 21, 22 ]
os: [ 'windows-latest', 'macos-latest', 'ubuntu-latest' ]
runs-on: ${{ matrix.os }}
diff --git a/pom.xml b/pom.xml
index ded453146..dee0a8d46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<httpclient.version>4.5.14</httpclient.version>
<httpcore.version>4.4.16</httpcore.version>
- <netty.version>4.1.99.Final</netty.version>
+ <netty.version>4.1.112.Final</netty.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.13</logback.version>
@@ -87,7 +87,7 @@
<hamcrest.version>2.2</hamcrest.version>
<mockito.version>4.11.0</mockito.version>
<awaitility.version>4.2.0</awaitility.version>
- <bytebuddy.version>1.14.8</bytebuddy.version>
+ <bytebuddy.version>1.14.18</bytebuddy.version>
<h2.version>2.2.224</h2.version>
<hikari-cp.version>4.0.3</hikari-cp.version>
@@ -113,7 +113,7 @@
<maven-pmd-plugin.version>3.20.0</maven-pmd-plugin.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
- <jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
+ <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<!-- Report plugin versions -->
<maven-site-plugin.version>4.0.0-M6</maven-site-plugin.version>
diff --git a/spring/pom.xml b/spring/pom.xml
index bec630362..619845828 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -34,9 +34,8 @@
</modules>
<properties>
- <springboot.version>2.7.10</springboot.version>
- <springframework.version>5.3.26</springframework.version>
- <aspectj.version>1.9.1</aspectj.version>
+ <springboot.version>2.7.18</springboot.version>
+ <aspectj.version>1.9.22.1</aspectj.version>
</properties>
<dependencyManagement>
@@ -48,30 +47,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${springframework.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>${springframework.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${springframework.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.aspectj</groupId>
