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 5a7a4d9cd4d Activate default-dep profile by default (#35362) 5a7a4d9cd4d is described below commit 5a7a4d9cd4dd71d94d59c7c0f10a1ccbbefa773f Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sat May 10 19:00:52 2025 +0800 Activate default-dep profile by default (#35362) * Activate default-dep profile by default - Move default-dep profile to pom.xml root level - Remove redundant profile configurations - Update build commands in various files to include default-dep * Activate default-dep profile by default - Move default-dep profile to pom.xml root level - Remove redundant profile configurations - Update build commands in various files to include default-dep --- .github/workflows/e2e-agent.yml | 2 +- .github/workflows/nightly-build.yml | 8 +- .github/workflows/nightly-e2e-agent.yml | 2 +- agent/README.md | 2 +- distribution/pom.xml | 220 +++++++++++++++++++++ distribution/proxy-native/pom.xml | 43 ---- distribution/proxy/pom.xml | 218 -------------------- ...inute_Quick_Start_Guide_to_ShardingSphere.cn.md | 2 +- ...inute_Quick_Start_Guide_to_ShardingSphere.en.md | 2 +- .../content/involved/contribute/contributor.cn.md | 2 +- .../content/involved/contribute/contributor.en.md | 2 +- .../shardingsphere-jdbc/observability/_index.cn.md | 4 +- .../shardingsphere-jdbc/observability/_index.en.md | 4 +- .../observability/_index.cn.md | 2 +- .../observability/_index.en.md | 2 +- .../shardingsphere-proxy/startup/docker.cn.md | 2 +- .../shardingsphere-proxy/startup/docker.en.md | 2 +- .../startup/graalvm-native-image.cn.md | 6 +- .../startup/graalvm-native-image.en.md | 6 +- examples/README.md | 2 +- 20 files changed, 246 insertions(+), 287 deletions(-) diff --git a/.github/workflows/e2e-agent.yml b/.github/workflows/e2e-agent.yml index 8b100b21c4b..a335697cef8 100644 --- a/.github/workflows/e2e-agent.yml +++ b/.github/workflows/e2e-agent.yml @@ -66,7 +66,7 @@ jobs: apache-shardingsphere-maven-third-party-e2e-cache- apache-shardingsphere-maven-third-party- - name: Build Project - run: ./mvnw -B clean install -DskipTests -Prelease + run: ./mvnw -B clean install -DskipTests -Prelease,default-dep - name: Build Proxy E2E Image run: ./mvnw clean install -DskipTests -Pit.env.proxy -f test/e2e/agent/engine/pom.xml - name: Save Proxy E2E Image diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml index 73bc8137396..5e07dd02cc2 100644 --- a/.github/workflows/nightly-build.yml +++ b/.github/workflows/nightly-build.yml @@ -60,7 +60,7 @@ jobs: java-version: 11 - name: Build Project run: | - ./mvnw -B clean install -Prelease + ./mvnw -B clean install -Prelease,default-dep - uses: burnett01/rsync-deployments@5.2 with: switches: -avzr @@ -104,7 +104,7 @@ jobs: - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - name: Push Docker Image - run: ./mvnw -am -pl distribution/proxy -B -Prelease,docker.buildx.push -DskipTests -Dproxy.image.repository=${{ env.PROXY }} -Dproxy.image.tag=${{ github.sha }} clean install + run: ./mvnw -am -pl distribution/proxy -B -Prelease,default-dep,docker.buildx.push -DskipTests -Dproxy.image.repository=${{ env.PROXY }} -Dproxy.image.tag=${{ github.sha }} clean install build-proxy-native-image: if: github.repository == 'apache/shardingsphere' @@ -133,7 +133,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Push Docker Image run: | - ./mvnw -am -pl distribution/proxy-native -Prelease.native,docker.buildx.push.native -B -T1C -DskipTests -Dproxy.native.image.repository=${{ env.PROXY_NATIVE }} -Dproxy.native.image.tag=${{ github.sha }} clean package + ./mvnw -am -pl distribution/proxy-native -Prelease.native,default-dep,docker.buildx.push.native -B -T1C -DskipTests -Dproxy.native.image.repository=${{ env.PROXY_NATIVE }} -Dproxy.native.image.tag=${{ github.sha }} clean package build-agent-image: if: github.repository == 'apache/shardingsphere' @@ -160,7 +160,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Push Docker Image run: | - ./mvnw -am -pl distribution/agent -Prelease,docker.buildx.push -B -T1C -DskipTests -Dagent.image.repository=${{ env.AGENT }} -Dagent.image.tag=${{ github.sha }} clean package + ./mvnw -am -pl distribution/agent -Prelease,default-dep,docker.buildx.push -B -T1C -DskipTests -Dagent.image.repository=${{ env.AGENT }} -Dagent.image.tag=${{ github.sha }} clean package build-cache: if: github.repository == 'apache/shardingsphere' diff --git a/.github/workflows/nightly-e2e-agent.yml b/.github/workflows/nightly-e2e-agent.yml index c94cb052525..ff6809e16a3 100644 --- a/.github/workflows/nightly-e2e-agent.yml +++ b/.github/workflows/nightly-e2e-agent.yml @@ -54,7 +54,7 @@ jobs: apache-shardingsphere-maven-third-party-e2e-cache- apache-shardingsphere-maven-third-party- - name: Build Project - run: ./mvnw -B clean install -DskipTests -Prelease + run: ./mvnw -B clean install -DskipTests -Prelease,default-dep - name: Build Proxy E2E Image run: ./mvnw clean install -DskipTests -Pit.env.proxy -f test/e2e/agent/engine/pom.xml - name: Save Proxy E2E Image diff --git a/agent/README.md b/agent/README.md index 5e4a7836203..eeac3fba33a 100644 --- a/agent/README.md +++ b/agent/README.md @@ -24,7 +24,7 @@ Supports for OpenTelemetry. ```shell git clone https://github.com/apache/shardingsphere.git cd shardingsphere -./mvnw clean install -Prelease +./mvnw clean install -Prelease,default-dep ``` Artifact is `distribution/agent/target/apache-shardingsphere-${latest.release.version}-shardingsphere-agent-bin.tar.gz` diff --git a/distribution/pom.xml b/distribution/pom.xml index 175ebd0f20d..328c4743422 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -72,4 +72,224 @@ </plugins> </pluginManagement> </build> + + <profiles> + <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> + + <profile> + <id>db-postgresql</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-postgresql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>db-mysql</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-mysql</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>db-oracle</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-oracle</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>db-sqlserver</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-sqlserver</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>db-opengauss</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-opengauss</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.opengauss</groupId> + <artifactId>opengauss-jdbc</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>db-firebird</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-firebird</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.firebirdsql.jdbc</groupId> + <artifactId>jaybird</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>db-hive</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-hive</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.hive</groupId> + <artifactId>hive-jdbc</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>db-presto</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-presto</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.facebook.presto</groupId> + <artifactId>presto-jdbc</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>db-clickhouse</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-clickhouse</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.clickhouse</groupId> + <artifactId>clickhouse-jdbc</artifactId> + <classifier>http</classifier> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>db-doris</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-parser-sql-doris</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>db-mariadb</id> + <dependencies> + <dependency> + <groupId>org.apache.shardingsphere</groupId> + <artifactId>shardingsphere-infra-database-mariadb</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + </profiles> </project> diff --git a/distribution/proxy-native/pom.xml b/distribution/proxy-native/pom.xml index c0621be265c..439b5b43913 100644 --- a/distribution/proxy-native/pom.xml +++ b/distribution/proxy-native/pom.xml @@ -52,49 +52,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> diff --git a/distribution/proxy/pom.xml b/distribution/proxy/pom.xml index e2d75bff72e..2daacb43b32 100644 --- a/distribution/proxy/pom.xml +++ b/distribution/proxy/pom.xml @@ -232,223 +232,5 @@ </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> - - <profile> - <id>db-postgresql</id> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-postgresql</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>db-mysql</id> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-mysql</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.mysql</groupId> - <artifactId>mysql-connector-j</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>db-oracle</id> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-oracle</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>db-sqlserver</id> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-sqlserver</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>db-opengauss</id> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-opengauss</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.opengauss</groupId> - <artifactId>opengauss-jdbc</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>db-firebird</id> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-firebird</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.firebirdsql.jdbc</groupId> - <artifactId>jaybird</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>db-hive</id> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-hive</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-jdbc</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>db-presto</id> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-presto</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.facebook.presto</groupId> - <artifactId>presto-jdbc</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>db-clickhouse</id> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-clickhouse</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.clickhouse</groupId> - <artifactId>clickhouse-jdbc</artifactId> - <classifier>http</classifier> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>db-doris</id> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-parser-sql-doris</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>com.mysql</groupId> - <artifactId>mysql-connector-j</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>db-mariadb</id> - <dependencies> - <dependency> - <groupId>org.apache.shardingsphere</groupId> - <artifactId>shardingsphere-infra-database-mariadb</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> </profiles> </project> diff --git a/docs/blog/content/material/Oct_12_4_Updates_and_FAQ_Your_1_Minute_Quick_Start_Guide_to_ShardingSphere.cn.md b/docs/blog/content/material/Oct_12_4_Updates_and_FAQ_Your_1_Minute_Quick_Start_Guide_to_ShardingSphere.cn.md index dff36aa68c6..a21da4401ef 100644 --- a/docs/blog/content/material/Oct_12_4_Updates_and_FAQ_Your_1_Minute_Quick_Start_Guide_to_ShardingSphere.cn.md +++ b/docs/blog/content/material/Oct_12_4_Updates_and_FAQ_Your_1_Minute_Quick_Start_Guide_to_ShardingSphere.cn.md @@ -221,7 +221,7 @@ shardingsphere-example 对 MySQL 和 PostgreSQL 连接驱动进行了升级。 git clone https://github.com/apache/shardingsphere.git ## 编译源代码 cd shardingsphere -mvn clean install -Prelease +mvn clean install -Prelease,default-dep ~~~ 3.将 shardingsphere-example 项目导入自己的 IDE 中; diff --git a/docs/blog/content/material/Oct_12_4_Updates_and_FAQ_Your_1_Minute_Quick_Start_Guide_to_ShardingSphere.en.md b/docs/blog/content/material/Oct_12_4_Updates_and_FAQ_Your_1_Minute_Quick_Start_Guide_to_ShardingSphere.en.md index 93b1c8365cd..b750c22aa01 100644 --- a/docs/blog/content/material/Oct_12_4_Updates_and_FAQ_Your_1_Minute_Quick_Start_Guide_to_ShardingSphere.en.md +++ b/docs/blog/content/material/Oct_12_4_Updates_and_FAQ_Your_1_Minute_Quick_Start_Guide_to_ShardingSphere.en.md @@ -212,7 +212,7 @@ There are many modules in the project shardingsphere-example. But for now, we on > git clone https://github.com/apache/shardingsphere.git cd shardingsphere -mvn clean install -Prelease +mvn clean install -Prelease,default-dep 3. Import the shardingsphere-example project to your IDE; diff --git a/docs/community/content/involved/contribute/contributor.cn.md b/docs/community/content/involved/contribute/contributor.cn.md index 7505dbf761e..59fa48b37a0 100644 --- a/docs/community/content/involved/contribute/contributor.cn.md +++ b/docs/community/content/involved/contribute/contributor.cn.md @@ -40,7 +40,7 @@ git remote -v ```shell cd shardingsphere -./mvnw clean install -DskipITs -DskipTests -Prelease +./mvnw clean install -DskipITs -DskipTests -Prelease,default-dep ``` 当你以后从 ShardingSphere 拉取最新代码并新建分支,可能会遇到类似的解析器编译错误,可以重新运行这个命令来解决问题。 diff --git a/docs/community/content/involved/contribute/contributor.en.md b/docs/community/content/involved/contribute/contributor.en.md index 0a64dda87e3..90c50021ffa 100644 --- a/docs/community/content/involved/contribute/contributor.en.md +++ b/docs/community/content/involved/contribute/contributor.en.md @@ -40,7 +40,7 @@ Build and install all modules, it'll install modules into Maven local repository ```shell cd shardingsphere -./mvnw clean install -DskipITs -DskipTests -Prelease +./mvnw clean install -DskipITs -DskipTests -Prelease,default-dep ``` When you pull the latest code from ShardingSphere and create new branch later, you might get similar compile error of parser again, then you could run this command again. diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.cn.md index 73b9c8cc909..61d31d86f47 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.cn.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.cn.md @@ -12,7 +12,7 @@ weight = 7 ```shell git clone --depth 1 https://github.com/apache/shardingsphere.git cd shardingsphere -mvn clean install -DskipITs -DskipTests -Prelease +mvn clean install -DskipITs -DskipTests -Prelease,default-dep ``` Agent 制品 `distribution/agent/target/apache-shardingsphere-${latest.release.version}-shardingsphere-agent-bin.tar.gz` @@ -119,7 +119,7 @@ ShardingSphere Agent 存在可用的 `Dockerfile` 用于方便分发。可执行 ```shell git clone g...@github.com:apache/shardingsphere.git cd ./shardingsphere/ -./mvnw -am -pl distribution/agent -Prelease,docker -T1C -DskipTests clean package +./mvnw -am -pl distribution/agent -Prelease,default-dep,docker -T1C -DskipTests clean package ``` 此后若在自定义 `Dockerfile` 中添加以下语句,这会将 ShardingSphere Agent 的目录复制到 `/shardingsphere-agent/` 。 diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.en.md index 9ee8add0048..593579bbd9a 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.en.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/observability/_index.en.md @@ -12,7 +12,7 @@ Download Apache ShardingSphere from GitHub,Then compile. ```shell git clone --depth 1 https://github.com/apache/shardingsphere.git cd shardingsphere -mvn clean install -DskipITs -DskipTests -Prelease +mvn clean install -DskipITs -DskipTests -Prelease,default-dep ``` Agent artifact is `distribution/agent/target/apache-shardingsphere-${latest.release.version}-shardingsphere-agent-bin.tar.gz` @@ -121,7 +121,7 @@ ShardingSphere Agent has a `Dockerfile` available for easy distribution. You can ```shell git clone g...@github.com:apache/shardingsphere.git cd ./shardingsphere/ -./mvnw -am -pl distribution/agent -Prelease,docker -T1C -DskipTests clean package +./mvnw -am -pl distribution/agent -Prelease,default-dep,docker -T1C -DskipTests clean package ``` If you add the following statement in your custom `Dockerfile`, it will copy the ShardingSphere Agent directory to `/shardingsphere-agent/`. diff --git a/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.cn.md index 559f1b966e2..4f3d72d5931 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.cn.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.cn.md @@ -12,7 +12,7 @@ weight = 5 ```shell git clone --depth 1 https://github.com/apache/shardingsphere.git cd shardingsphere -mvn clean install -DskipITs -DskipTests -Prelease +mvn clean install -DskipITs -DskipTests -Prelease,default-dep ``` Agent 制品 `distribution/agent/target/apache-shardingsphere-${latest.release.version}-shardingsphere-agent-bin.tar.gz` diff --git a/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.en.md b/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.en.md index 7be01475ef7..b85b34ac948 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.en.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.en.md @@ -12,7 +12,7 @@ Download Apache ShardingSphere from GitHub,Then compile. ```shell git clone --depth 1 https://github.com/apache/shardingsphere.git cd shardingsphere -mvn clean install -DskipITs -DskipTests -Prelease +mvn clean install -DskipITs -DskipTests -Prelease,default-dep ``` Agent artifact is `distribution/agent/target/apache-shardingsphere-${latest.release.version}-shardingsphere-agent-bin.tar.gz` diff --git a/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.cn.md index bd5dc93111e..a09ae216314 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.cn.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.cn.md @@ -27,7 +27,7 @@ docker pull apache/shardingsphere-proxy git clone https://github.com/apache/shardingsphere ./mvnw clean install cd shardingsphere-distribution/shardingsphere-proxy-distribution -./mvnw clean package -Prelease,docker +./mvnw clean package -Prelease,default-dep,docker ``` 如果遇到以下问题,请确保 Docker daemon 进程已经运行。 diff --git a/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.en.md b/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.en.md index 2b54294d84f..3e33330e723 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.en.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/docker.en.md @@ -27,7 +27,7 @@ docker pull apache/shardingsphere-proxy git clone https://github.com/apache/shardingsphere ./mvnw clean install cd shardingsphere-distribution/shardingsphere-proxy-distribution -./mvnw clean package -Prelease,docker +./mvnw clean package -Prelease,default-dep,docker ``` If the following problems emerge, please make sure Docker daemon Process is running. diff --git a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md index 742e24e0e33..55ac23fdba3 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md @@ -84,7 +84,7 @@ sdk use java 22.0.2-graalce ```bash cd ./shardingsphere/ -./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native -DskipTests clean package +./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native,default-dep -DskipTests clean package ``` 情形二:需要使用存在自定义 SPI 实现的 JAR 或第三方依赖的 JAR。在 `distribution/proxy-native/pom.xml` 的 `dependencies` 加入如下选项之一, @@ -108,7 +108,7 @@ cd ./shardingsphere/ ```bash cd ./shardingsphere/ -./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native -DskipTests clean package +./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native,default-dep -DskipTests clean package ``` 3. 通过命令行启动 Native Image, 需要带上 4 个参数, @@ -134,7 +134,7 @@ cd ./distribution/proxy-native/target/apache-shardingsphere-5.5.2-shardingsphere ```shell cd ./shardingsphere/ -./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native,docker.native -DskipTests clean package +./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native,default-dep,docker.native -DskipTests clean package ``` 假设存在包含 `global.yaml` 的 `conf` 文件夹为 `./custom/conf`,可通过如下的 `docker-compose.yml` 文件启动包含 GraalVM Native Image 的 Docker Image。 diff --git a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md index 1daf30b182f..e6bb72f4616 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md @@ -85,7 +85,7 @@ Case 1: No need to use JAR with custom SPI implementation or third-party depende ```bash cd ./shardingsphere/ -./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native -DskipTests clean package +./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native,default-dep -DskipTests clean package ``` Case 2: Need to use JAR with custom SPI implementation or third-party dependent JAR. Add one of the following options to the `dependencies` of `distribution/proxy-native/pom.xml`: @@ -110,7 +110,7 @@ Then build the GraalVM Native Image through the command line. ```bash cd ./shardingsphere/ -./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native -DskipTests clean package +./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native,default-dep -DskipTests clean package ``` 3. To start Native Image through the command line, you need to bring 4 parameters. @@ -137,7 +137,7 @@ cd ./distribution/proxy-native/target/apache-shardingsphere-5.5.2-shardingsphere ```shell cd ./shardingsphere/ -./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native,docker.native -DskipTests clean package +./mvnw -am -pl distribution/proxy-native -T1C -Prelease.native,default-dep,docker.native -DskipTests clean package ``` Assuming that there is a conf folder called `./custom/conf` containing `global.yaml`, diff --git a/examples/README.md b/examples/README.md index 554370ca750..3cad6d680ca 100644 --- a/examples/README.md +++ b/examples/README.md @@ -23,7 +23,7 @@ git clone https://github.com/apache/shardingsphere.git ## compile source code cd shardingsphere -./mvnw clean install -Prelease +./mvnw clean install -Prelease,default-dep ``` ## Module design