Skip to content

Commit e2fa0d3

Browse files
committed
Support compiling and using ShardingSphere under OpenJDK 23
1 parent 2b6fcca commit e2fa0d3

File tree

7 files changed

+384
-474
lines changed

7 files changed

+384
-474
lines changed

.github/workflows/nightly-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
fail-fast: false
4242
matrix:
4343
os: [ ubuntu-latest, macos-latest, windows-latest ]
44-
java-version: [ 11, 17, 21, 22 ]
44+
java-version: [ 11, 17, 21, 23 ]
4545
steps:
4646
- name: Support Long Paths in Windows
4747
if: matrix.os == 'windows-latest'

.mvn/wrapper/maven-wrapper.properties

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
18
#
2-
# Licensed to the Apache Software Foundation (ASF) under one or more
3-
# contributor license agreements. See the NOTICE file distributed with
4-
# this work for additional information regarding copyright ownership.
5-
# The ASF licenses this file to You under the Apache License, Version 2.0
6-
# (the "License"); you may not use this file except in compliance with
7-
# the License. You may obtain a copy of the License at
9+
# http://www.apache.org/licenses/LICENSE-2.0
810
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing, software
12-
# distributed under the License is distributed on an "AS IS" BASIS,
13-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
# See the License for the specific language governing permissions and
15-
# limitations under the License.
16-
#
17-
18-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
19-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

RELEASE-NOTES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
1. DistSQL: Check duplicate actual data nodes when creating or altering sharding table rule - [#33138](https://github.com/apache/shardingsphere/pull/33138)
1616
1. DistSQL: Check user privilege when registering or altering storage unit - [#32172](https://github.com/apache/shardingsphere/pull/32172)
1717
1. Infra: Enable Safe Composition of Metadata for ShardingSphere Proxy Native - [#33179](https://github.com/apache/shardingsphere/pull/33179)
18+
1. Infra: Support compiling and using ShardingSphere under OpenJDK 23 - [#33025](https://github.com/apache/shardingsphere/pull/33025)
1819

1920
### Bug Fix
2021

agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/PluginLifecycleServiceManagerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import org.apache.shardingsphere.agent.api.PluginConfiguration;
2222
import org.junit.jupiter.api.Test;
2323

24-
import javax.management.loading.PrivateMLet;
2524
import java.net.MalformedURLException;
2625
import java.net.URL;
26+
import java.net.URLClassLoader;
2727
import java.net.URLStreamHandlerFactory;
2828
import java.nio.file.Paths;
2929
import java.util.Collections;
@@ -52,8 +52,8 @@ void assertInitPluginLifecycleServiceWithMap() {
5252
void assertInitPluginLifecycleServiceWithMockHandler() throws MalformedURLException {
5353
URLStreamHandlerFactory urlStreamHandlerFactory = mock(URLStreamHandlerFactory.class);
5454
PluginLifecycleServiceManager.init(Collections.emptyMap(), Collections.emptyList(),
55-
new PrivateMLet(new URL[]{Paths.get(System.getProperty("java.io.tmpdir"), "test.txt").toUri().toURL()},
56-
new MultipleParentClassLoader(Collections.emptyList()), urlStreamHandlerFactory, true),
55+
new URLClassLoader(new URL[]{Paths.get(System.getProperty("java.io.tmpdir"), "test.txt").toUri().toURL()},
56+
new MultipleParentClassLoader(Collections.emptyList()), urlStreamHandlerFactory),
5757
true);
5858
verify(urlStreamHandlerFactory).createURLStreamHandler(anyString());
5959
}

0 commit comments

Comments
 (0)