diff --git a/.github/workflows/ci_e2e.yml b/.github/workflows/ci_e2e.yml index 631ea7f252..eb254c4277 100644 --- a/.github/workflows/ci_e2e.yml +++ b/.github/workflows/ci_e2e.yml @@ -47,7 +47,7 @@ jobs: sh ./docker/build/hooks/build - name: Docker Run run: | - export VERSION=$(cat $(pwd)/pom.xml | grep '' -m 1 | awk '{print $1}' | sed 's///' | sed 's/<\/revision>//') + export VERSION=$(cat $(pwd)/pom.xml | grep '' -m 1 | awk '{print $1}' | sed 's///' | sed 's/<\/version>//') sed -i "s/apache\/dolphinscheduler:latest/apache\/dolphinscheduler:${VERSION}/g" $(pwd)/docker/docker-swarm/docker-compose.yml docker-compose -f $(pwd)/docker/docker-swarm/docker-compose.yml up -d - name: Check Server Status diff --git a/docker/build/hooks/build b/docker/build/hooks/build index b9ffa0829b..a62a53add6 100755 --- a/docker/build/hooks/build +++ b/docker/build/hooks/build @@ -24,7 +24,7 @@ printenv if [ -z "${VERSION}" ] then echo "set default environment variable [VERSION]" - export VERSION=$(cat $(pwd)/pom.xml | grep '' -m 1 | awk '{print $1}' | sed 's///' | sed 's/<\/revision>//') + export VERSION=$(cat $(pwd)/pom.xml | grep '' -m 1 | awk '{print $1}' | sed 's///' | sed 's/<\/version>//') fi if [ "${DOCKER_REPO}x" = "x" ] diff --git a/docker/build/hooks/build.bat b/docker/build/hooks/build.bat index 7947a63722..e3a330f33d 100644 --- a/docker/build/hooks/build.bat +++ b/docker/build/hooks/build.bat @@ -22,7 +22,7 @@ setlocal enableextensions enabledelayedexpansion if not defined VERSION ( echo "set environment variable [VERSION]" set first=1 - for /f "tokens=3 delims=<>" %%a in ('findstr "[0-9].*" %cd%\pom.xml') do ( + for /f "tokens=3 delims=<>" %%a in ('findstr "[0-9].*" %cd%\pom.xml') do ( if !first! EQU 1 (set VERSION=%%a) set first=0 ) diff --git a/dolphinscheduler-alert/pom.xml b/dolphinscheduler-alert/pom.xml index f5a65aa130..38fb3e1f9a 100644 --- a/dolphinscheduler-alert/pom.xml +++ b/dolphinscheduler-alert/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT dolphinscheduler-alert ${project.artifactId} diff --git a/dolphinscheduler-api/pom.xml b/dolphinscheduler-api/pom.xml index 8ae2161cc0..4cb3524efb 100644 --- a/dolphinscheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT dolphinscheduler-api ${project.artifactId} diff --git a/dolphinscheduler-common/pom.xml b/dolphinscheduler-common/pom.xml index 90b9ab073e..356240cc6f 100644 --- a/dolphinscheduler-common/pom.xml +++ b/dolphinscheduler-common/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT dolphinscheduler-common dolphinscheduler-common diff --git a/dolphinscheduler-dao/pom.xml b/dolphinscheduler-dao/pom.xml index df7e30d378..e7d947b5a1 100644 --- a/dolphinscheduler-dao/pom.xml +++ b/dolphinscheduler-dao/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT dolphinscheduler-dao ${project.artifactId} diff --git a/dolphinscheduler-dist/pom.xml b/dolphinscheduler-dist/pom.xml index 3c44ffa500..9d525d30ac 100644 --- a/dolphinscheduler-dist/pom.xml +++ b/dolphinscheduler-dist/pom.xml @@ -20,7 +20,7 @@ dolphinscheduler org.apache.dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-plugin-api/pom.xml b/dolphinscheduler-plugin-api/pom.xml index 882ea613f8..bbb5a8a49f 100644 --- a/dolphinscheduler-plugin-api/pom.xml +++ b/dolphinscheduler-plugin-api/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT dolphinscheduler-plugin-api ${project.artifactId} diff --git a/dolphinscheduler-remote/pom.xml b/dolphinscheduler-remote/pom.xml index 18fcccc393..74cfd81c44 100644 --- a/dolphinscheduler-remote/pom.xml +++ b/dolphinscheduler-remote/pom.xml @@ -19,7 +19,7 @@ dolphinscheduler org.apache.dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-server/pom.xml b/dolphinscheduler-server/pom.xml index 1ed83f0630..0514262469 100644 --- a/dolphinscheduler-server/pom.xml +++ b/dolphinscheduler-server/pom.xml @@ -21,7 +21,7 @@ org.apache.dolphinscheduler dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT dolphinscheduler-server dolphinscheduler-server diff --git a/dolphinscheduler-service/pom.xml b/dolphinscheduler-service/pom.xml index 8d22060fba..2d0e4fd41d 100644 --- a/dolphinscheduler-service/pom.xml +++ b/dolphinscheduler-service/pom.xml @@ -19,7 +19,7 @@ dolphinscheduler org.apache.dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT 4.0.0 diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml index 74d01c8905..166ce74c9f 100644 --- a/dolphinscheduler-ui/pom.xml +++ b/dolphinscheduler-ui/pom.xml @@ -20,7 +20,7 @@ dolphinscheduler org.apache.dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT 4.0.0 diff --git a/ext/skywalking/pom.xml b/ext/skywalking/pom.xml index 805788f00c..cb7121e056 100644 --- a/ext/skywalking/pom.xml +++ b/ext/skywalking/pom.xml @@ -19,7 +19,7 @@ dolphinscheduler org.apache.dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f54bb07548..a4be9385f9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 org.apache.dolphinscheduler dolphinscheduler - ${revision} + 1.3.6-SNAPSHOT pom ${project.artifactId} http://dolphinscheduler.apache.org @@ -55,7 +55,6 @@ - 1.3.6-SNAPSHOT UTF-8 UTF-8 4.3.0