This is an automated email from the ASF dual-hosted git repository.
jimin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 544dbadebd optimize: optimize the default compilation to be
independent of the Git Env (#6583)
544dbadebd is described below
commit 544dbadebd9dbe8fbe254afa8eb0f51208019f8a
Author: jimin <[email protected]>
AuthorDate: Mon May 27 23:10:15 2024 +0800
optimize: optimize the default compilation to be independent of the Git Env
(#6583)
---
.github/workflows/build.yml | 5 +----
.github/workflows/test-druid.yml | 1 -
.github/workflows/test.yml | 13 ++++++-------
build/pom.xml | 6 +++++-
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 1 +
distribution/pom.xml | 3 +++
pom.xml | 5 +++++
8 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d57645eb41..ab72a4f1d6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,15 +39,13 @@ jobs:
if: matrix.java == '8'
run: |
./mvnw -T 4C clean test \
- -Dcheckstyle.skip=false -Dpmd.skip=false -Dlicense.skip=false
\
- -Dmaven.git-commit-id.skip=true -DredisCaseEnabled=true \
+ -Dcheckstyle.skip=false -Dpmd.skip=false -Dlicense.skip=false
-DredisCaseEnabled=true \
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
# step 4.2
- name: "Test with Maven and Java${{ matrix.java }}"
if: matrix.java != '8'
run: |
./mvnw -T 4C clean test \
- -Dmaven.git-commit-id.skip=true \
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
# step 5
- name: "Codecov"
@@ -82,5 +80,4 @@ jobs:
mvn clean install \
-Prelease-seata \
-DskipTests \
- -Dmaven.git-commit-id.skip=true \
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
diff --git a/.github/workflows/test-druid.yml b/.github/workflows/test-druid.yml
index f004c41db8..9bc33c4f46 100644
--- a/.github/workflows/test-druid.yml
+++ b/.github/workflows/test-druid.yml
@@ -59,5 +59,4 @@ jobs:
run: |
./mvnw -T 4C clean test \
-Ddruid.version=${{ matrix.druid }} \
- -Dmaven.git-commit-id.skip=true \
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0ce1217ad8..98813bf270 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -43,16 +43,16 @@ jobs:
if: matrix.os != 'windows'
run: |
if [ "${{ matrix.os }}" == "macos" ]; then
- ./mvnw -T 4C clean test -P args-for-client-test -P arrch64
-Dspring-boot.version=${{ matrix.springboot }} -Dmaven.git-commit-id.skip=true
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw -T 4C clean test -P args-for-client-test -P arrch64
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
else
- ./mvnw -T 4C clean test -P args-for-client-test
-Dspring-boot.version=${{ matrix.springboot }} -Dmaven.git-commit-id.skip=true
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw -T 4C clean test -P args-for-client-test
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
fi
## step 3.2: for Windows
- name: "Build with Maven on 'windows' OS (Skip tests)"
if: matrix.os == 'windows'
run: | # Skip tests, because too many errors in unit-test.
./mvnw.cmd -version;
- ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D
spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true
-e -B -D
org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D
spring-boot.version=${{ matrix.springboot }} -e -B -D
org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
# job 2
test-springboot3x:
@@ -88,16 +88,16 @@ jobs:
if: matrix.os != 'windows'
run: |
if [ "${{ matrix.os }}" == "macos" ]; then
- ./mvnw -T 4C clean test -P args-for-client-test -P arrch64
-Dspring-boot.version=${{ matrix.springboot }} -Dmaven.git-commit-id.skip=true
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw -T 4C clean test -P args-for-client-test -P arrch64
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
else
- ./mvnw -T 4C clean test -P args-for-client-test
-Dspring-boot.version=${{ matrix.springboot }} -Dmaven.git-commit-id.skip=true
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw -T 4C clean test -P args-for-client-test
-Dspring-boot.version=${{ matrix.springboot }} -e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
fi
## step 3.2: for Windows
- name: "Build with Maven on 'windows' OS (Skip tests)"
if: matrix.os == 'windows'
run: | # Skip tests, because too many errors in unit-test.
./mvnw.cmd -version;
- ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D
spring-boot.version=${{ matrix.springboot }} -D maven.git-commit-id.skip=true
-e -B -D
org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ ./mvnw.cmd clean install -P args-for-client-test -DskipTests -D
spring-boot.version=${{ matrix.springboot }} -e -B -D
org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
# job 3
test-arm64:
@@ -136,5 +136,4 @@ jobs:
-Dspring-boot.version=${{ matrix.springboot }} \
-Prelease-seata \
-DskipTests \
- -Dmaven.git-commit-id.skip=true \
-e -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
diff --git a/build/pom.xml b/build/pom.xml
index 04a19faf6c..2f072af7de 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -135,7 +135,7 @@
<license.skip>true</license.skip>
<pmd.skip>true</pmd.skip>
<maven.test.skip>false</maven.test.skip>
- <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
+ <maven.git-commit-id.skip>true</maven.git-commit-id.skip>
<maven.surefire.argLine></maven.surefire.argLine>
<maven.surefire.excludes></maven.surefire.excludes>
@@ -354,6 +354,9 @@
<!-- profile: release -->
<profile>
<id>release</id>
+ <properties>
+ <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
+ </properties>
<build>
<plugins>
<!-- Javadoc -->
@@ -399,6 +402,7 @@
<properties>
<gpg.arg1>--pinentry-mode</gpg.arg1>
<gpg.arg2>loopback</gpg.arg2>
+ <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
</properties>
</profile>
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 6e14f34cc8..5480ee56e5 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -144,6 +144,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6570](https://github.com/apache/incubator-seata/pull/6570)] add notice
file to binary
- [[#6578](https://github.com/apache/incubator-seata/pull/6578)] registry.conf
supplemented raft configuration
- [[#6576](https://github.com/apache/incubator-seata/pull/6576)] remove oracle
datatype parser
+- [[#6583](https://github.com/apache/incubator-seata/pull/6583)] optimize the
default compilation to be independent of the Git Env
### security:
- [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava
dependencies to fix security vulnerabilities
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index f5d1467212..5ed10981c3 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -143,6 +143,7 @@
- [[#6570](https://github.com/apache/incubator-seata/pull/6570)] 添加 notice 文件
- [[#6578](https://github.com/apache/incubator-seata/pull/6578)] registry.conf
补充raft配置
- [[#6576](https://github.com/apache/incubator-seata/pull/6576)] 移除 oracle
数据类型序列化扩展
+- [[#6583](https://github.com/apache/incubator-seata/pull/6583)] 优化默认编译不依赖 Git
环境
### security:
- [[#6069](https://github.com/apache/incubator-seata/pull/6069)]
升级Guava依赖版本，修复安全漏洞
diff --git a/distribution/pom.xml b/distribution/pom.xml
index d19adc51b5..d9ccffad6a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -34,6 +34,9 @@
<profiles>
<profile>
<id>release-seata</id>
+ <properties>
+ <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.seata</groupId>
diff --git a/pom.xml b/pom.xml
index c558031e11..69d9142a58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,6 +181,7 @@
<dependencies.copy.skip>false</dependencies.copy.skip>
<mysql.jdbc.version>5.1.42</mysql.jdbc.version>
<mysql8.jdbc.version>8.0.27</mysql8.jdbc.version>
+ <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
</properties>
</profile>
<!-- profile: release-image-based-on-java8 -->
@@ -188,6 +189,7 @@
<id>release-image-based-on-java8</id>
<properties>
<image.tags>${project.version},latest</image.tags>
+ <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
</properties>
</profile>
<!-- profile: release-image-based-on-java8-slim -->
@@ -195,6 +197,7 @@
<id>release-image-based-on-java8-slim</id>
<properties>
<image.tags>${project.version}-slim</image.tags>
+ <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
</properties>
</profile>
<!-- profile: release-image-based-on-java17 -->
@@ -202,6 +205,7 @@
<id>release-image-based-on-java17</id>
<properties>
<image.tags>${project.version}.jre17</image.tags>
+ <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
</properties>
</profile>
<!-- profile: release-image-based-on-java17-slim -->
@@ -209,6 +213,7 @@
<id>release-image-based-on-java17-slim</id>
<properties>
<image.tags>${project.version}.jre17-slim</image.tags>
+ <maven.git-commit-id.skip>false</maven.git-commit-id.skip>
</properties>
</profile>
<!-- profile: arrch64 -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
