Skip to content

Commit 006cd72

Browse files
authored
Merge pull request #40 from dynamic-datasource/shardingsphere-v550
Updates ShardingSphere to 5.5.0 and fall back on explicit version locking for Logback
2 parents bc030be + 04702ae commit 006cd72

File tree

8 files changed

+326
-440
lines changed

8 files changed

+326
-440
lines changed

.mvn/wrapper/maven-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17+
wrapperVersion=3.3.1
1718
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

README.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,17 @@
2828

2929
## Contributing
3030

31-
我们欢迎社区的贡献。
31+
我们欢迎社区的贡献。围绕此 git 的讨论与协作应通过 https://github.com/baomidou/dynamic-datasource/issues 进行。
3232

3333
针对 IDE,项目的语言级别应设置为 JDK 8,对于单独的 `com.baomidou:springboot3-sample` 子模块,语言级别应设置为 JDK 17 。
3434
在提交 Pull Request 之前, 请在本地通过 [OpenJDK 17, OpenJDK 21] 的 JDK 范围下完成此命令的验证。
35-
我们鼓励通过 `SDKMAN!` 切换到 `21.0.1-graalce` 来验证。
35+
我们鼓励通过 `SDKMAN!` 切换到 `21.0.2-graalce` 来验证。
3636

3737
```shell
38-
./mvnw -T1C clean test
38+
sdk install java 21.0.2-graalce
39+
sdk use java 21.0.2-graalce
40+
41+
git clone git@github.com:dynamic-datasource/dynamic-datasource-samples.git
42+
cd ./dynamic-datasource-samples/
43+
./mvnw -T1C -e clean test
3944
```

datasource-samples/druid-sample/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
<groupId>com.h2database</groupId>
4545
<artifactId>h2</artifactId>
4646
</dependency>
47-
<dependency>
48-
<groupId>ch.qos.logback</groupId>
49-
<artifactId>logback-classic</artifactId>
50-
</dependency>
5147
<dependency>
5248
<groupId>org.projectlombok</groupId>
5349
<artifactId>lombok</artifactId>

0 commit comments

Comments
 (0)