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.git
The following commit(s) were added to refs/heads/master by this push:
new 68a9ca5352f Move default dependencies to a separate profile (#35359)
68a9ca5352f is described below
commit 68a9ca5352f0c27399931b97c1d56fb1448e8287
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat May 10 16:32:15 2025 +0800
Move default dependencies to a separate profile (#35359)
- Create a new profile 'default-dep' in pom.xml for default dependencies
- Move MySQL, PostgreSQL, OpenGauss, Oracle and SQL Server parser
dependencies to the new profile
- Update release instructions in both Chinese and English to include the
new profile
- This change allows for more flexible dependency management and reduces
the size of the default distribution
---
distribution/proxy/pom.xml | 93 ++++++++++++----------
.../content/involved/release/shardingsphere.cn.md | 12 +--
.../content/involved/release/shardingsphere.en.md | 12 +--
3 files changed, 62 insertions(+), 55 deletions(-)
diff --git a/distribution/proxy/pom.xml b/distribution/proxy/pom.xml
index 2e9a90a64a3..3c7947523fe 100644
--- a/distribution/proxy/pom.xml
+++ b/distribution/proxy/pom.xml
@@ -40,49 +40,6 @@
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-parser-sql-mysql</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-parser-sql-postgresql</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-parser-sql-opengauss</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-parser-sql-oracle</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-parser-sql-sqlserver</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.opengauss</groupId>
- <artifactId>opengauss-jdbc</artifactId>
- <scope>runtime</scope>
- </dependency>
-
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
@@ -275,5 +232,55 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>default-dep</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-parser-sql-mysql</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+
<artifactId>shardingsphere-parser-sql-postgresql</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+
<artifactId>shardingsphere-parser-sql-opengauss</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-parser-sql-oracle</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+
<artifactId>shardingsphere-parser-sql-sqlserver</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opengauss</groupId>
+ <artifactId>opengauss-jdbc</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/docs/community/content/involved/release/shardingsphere.cn.md
b/docs/community/content/involved/release/shardingsphere.cn.md
index e56d9b160c4..db31cdfa2b0 100644
--- a/docs/community/content/involved/release/shardingsphere.cn.md
+++ b/docs/community/content/involved/release/shardingsphere.cn.md
@@ -233,10 +233,10 @@ export GPG_TTY=$(tty)
```
```shell
-./mvnw release:prepare -Prelease -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DdryRun=true -Dusername=${Github用户名}
+./mvnw release:prepare -Prelease,default-dep -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DdryRun=true -Dusername=${Github用户名}
```
--Prelease：选择 release 的 profile，这个 profile 会打包所有源码、jar 文件以及
ShardingSphere-Proxy 的可执行二进制包。
+-Prelease,default-dep：选择 release 的 profile，这个 profile 会打包默认依赖源码、jar 文件以及
ShardingSphere-Proxy 的可执行二进制包。
-DautoVersionSubmodules=true：作用是发布过程中版本号只需要输入一次，不必为每个子模块都输入一次。
@@ -251,7 +251,7 @@ export GPG_TTY=$(tty)
```
```shell
-./mvnw release:prepare -Prelease -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DpushChanges=false -Dusername=${Github 用户名}
+./mvnw release:prepare -Prelease,default-dep -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DpushChanges=false -Dusername=${Github 用户名}
```
和上一步演练的命令基本相同，去掉了 -DdryRun=true 参数。
@@ -270,7 +270,7 @@ git push origin ${RELEASE.VERSION}
使用稳定的网络环境，本过程可能持续`1`个小时以上。
```shell
-./mvnw release:perform -Prelease -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DlocalCheckout=true -Dusername=${Github 用户名}
+./mvnw release:perform -Prelease,default-dep -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DlocalCheckout=true -Dusername=${Github 用户名}
```
-DlocalCheckout=true：从本地 checkout 代替从远程仓库拉取代码。
@@ -568,7 +568,7 @@ docker login
```shell
cd ~/shardingsphere
git checkout ${RELEASE.VERSION}
-./mvnw -pl distribution/proxy -B -Prelease,docker.buildx.push clean package
+./mvnw -pl distribution/proxy -B -Prelease,default-dep,docker.buildx.push
clean package
```
3.4 确认发布成功
@@ -590,7 +590,7 @@ docker login ghcr.io/apache/shardingsphere
```shell
cd ~/shardingsphere
git checkout ${RELEASE.VERSION}
-./mvnw -am -pl distribution/agent -Prelease,docker.buildx.push -T 1C
-DskipTests clean package
+./mvnw -am -pl distribution/agent -Prelease,default-dep,docker.buildx.push -T
1C -DskipTests clean package
```
3.7 确认发布成功
diff --git a/docs/community/content/involved/release/shardingsphere.en.md
b/docs/community/content/involved/release/shardingsphere.en.md
index e8467e2a45a..9406188a282 100644
--- a/docs/community/content/involved/release/shardingsphere.en.md
+++ b/docs/community/content/involved/release/shardingsphere.en.md
@@ -235,10 +235,10 @@ export GPG_TTY=$(tty)
```
```shell
-./mvnw release:prepare -Prelease -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DdryRun=true -Dusername=${Github username}
+./mvnw release:prepare -Prelease,default-dep -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DdryRun=true -Dusername=${Github username}
```
--Prelease: choose release profile, which will pack all the source codes, jar
files and executable binary packages of ShardingSphere-Proxy.
+-Prelease,default-dep: choose release profile, which will pack all the source
codes, jar files and executable binary packages of ShardingSphere-Proxy.
-DautoVersionSubmodules=true: it can make the version number is inputted only
once and not for each sub-module.
@@ -255,7 +255,7 @@ First, clean local pre-release check information.
Then, prepare to execute the release.
```shell
-./mvnw release:prepare -Prelease -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DpushChanges=false -Dusername=${Github username}
+./mvnw release:prepare -Prelease,default-dep -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DpushChanges=false -Dusername=${Github username}
```
It is basically the same as the previous rehearsal command, but deleting
-DdryRun=true parameter.
@@ -271,7 +271,7 @@ git push origin ${RELEASE.VERSION}
### 4. Deploy the Release
```shell
-./mvnw release:perform -Prelease -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DlocalCheckout=true -Dusername=${Github username}
+./mvnw release:perform -Prelease,default-dep -Darguments="-DskipTests"
-DautoVersionSubmodules=true -DlocalCheckout=true -Dusername=${Github username}
```
-DlocalCheckout=true: checkout code from local repository instead of remote
repository.
@@ -573,7 +573,7 @@ docker login
```shell
cd ~/shardingsphere
git checkout ${RELEASE.VERSION}
-./mvnw -pl distribution/proxy -B -Prelease,docker.buildx.push clean package
+./mvnw -pl distribution/proxy -B -Prelease,default-dep,docker.buildx.push
clean package
```
3.4 Confirm the successful release
@@ -595,7 +595,7 @@ docker login ghcr.io/apache/shardingsphere
```shell
cd ~/shardingsphere
git checkout ${RELEASE.VERSION}
-./mvnw -am -pl distribution/agent -Prelease,docker.buildx.push -T 1C
-DskipTests clean package
+./mvnw -am -pl distribution/agent -Prelease,default-dep,docker.buildx.push -T
1C -DskipTests clean package
```
3.7 Confirm the successful release
