From a3f51f60b4dcf5b57b722b8a63a0a6481c3bfd59 Mon Sep 17 00:00:00 2001 From: "yh263208@oceanbase.com" Date: Thu, 22 Aug 2024 12:57:25 +0800 Subject: [PATCH] install pty4j manually --- .github/workflows/build_artifact.yaml | 16 ++++++++++++++ .github/workflows/build_daily.yaml | 32 +++++++++++++++++++++++++++ .github/workflows/build_dev.yaml | 16 ++++++++++++++ .github/workflows/build_release.yaml | 16 ++++++++++++++ client | 2 +- script/functions.sh | 22 +++++++++++++++++- server/odc-service/pom.xml | 4 ---- 7 files changed, 102 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_artifact.yaml b/.github/workflows/build_artifact.yaml index 1b948151d9..e8a11eebf0 100644 --- a/.github/workflows/build_artifact.yaml +++ b/.github/workflows/build_artifact.yaml @@ -185,6 +185,22 @@ jobs: mvn clean install -Dmaven.test.skip=true echo "Install db-browser success" popd + - name: Install pty4j + run: | + echo "Start install pty4j" + pushd import + echo "Current dir is "`pwd` + mvn install:install-file -Dfile=./pty4j-0.11.4.jar -DgroupId=org.jetbrains.pty4j -DartifactId=pty4j -Dversion=0.11.4 -Dpackaging=jar + echo "Install pty4j success" + popd + - name: Install purejavacomm + run: | + echo "Start install purejavacomm" + pushd import + echo "Current dir is "`pwd` + mvn install:install-file -Dfile=./purejavacomm-0.0.11.1.jar -DgroupId=org.jetbrains.pty4j -DartifactId=purejavacomm -Dversion=0.0.11.1 -Dpackaging=jar + echo "Install purejavacomm success" + popd - name: Build jar run: | echo "Start build jar packages" diff --git a/.github/workflows/build_daily.yaml b/.github/workflows/build_daily.yaml index 1d594926fa..70c634e534 100644 --- a/.github/workflows/build_daily.yaml +++ b/.github/workflows/build_daily.yaml @@ -79,6 +79,22 @@ jobs: mvn clean install -Dmaven.test.skip=true echo "Install db-browser success" popd + - name: Install pty4j + run: | + echo "Start install pty4j" + pushd import + echo "Current dir is "`pwd` + mvn install:install-file -Dfile=./pty4j-0.11.4.jar -DgroupId=org.jetbrains.pty4j -DartifactId=pty4j -Dversion=0.11.4 -Dpackaging=jar + echo "Install pty4j success" + popd + - name: Install purejavacomm + run: | + echo "Start install purejavacomm" + pushd import + echo "Current dir is "`pwd` + mvn install:install-file -Dfile=./purejavacomm-0.0.11.1.jar -DgroupId=org.jetbrains.pty4j -DartifactId=purejavacomm -Dversion=0.0.11.1 -Dpackaging=jar + echo "Install purejavacomm success" + popd - name: Build project run: mvn clean install -Dmaven.test.skip=true - name: Run PMD scan @@ -206,6 +222,22 @@ jobs: mvn clean install -Dmaven.test.skip=true echo "Install db-browser success" popd + - name: Install pty4j + run: | + echo "Start install pty4j" + pushd import + echo "Current dir is "`pwd` + mvn install:install-file -Dfile=./pty4j-0.11.4.jar -DgroupId=org.jetbrains.pty4j -DartifactId=pty4j -Dversion=0.11.4 -Dpackaging=jar + echo "Install pty4j success" + popd + - name: Install purejavacomm + run: | + echo "Start install purejavacomm" + pushd import + echo "Current dir is "`pwd` + mvn install:install-file -Dfile=./purejavacomm-0.0.11.1.jar -DgroupId=org.jetbrains.pty4j -DartifactId=purejavacomm -Dversion=0.0.11.1 -Dpackaging=jar + echo "Install purejavacomm success" + popd - name: Build jar & rpm (x86_64) run: | echo "Start prepare oceanbase-client" diff --git a/.github/workflows/build_dev.yaml b/.github/workflows/build_dev.yaml index b253af1e9c..3eea948bf8 100644 --- a/.github/workflows/build_dev.yaml +++ b/.github/workflows/build_dev.yaml @@ -66,6 +66,22 @@ jobs: mvn clean install -Dmaven.test.skip=true echo "Install db-browser success" popd + - name: Install pty4j + run: | + echo "Start install pty4j" + pushd import + echo "Current dir is "`pwd` + mvn install:install-file -Dfile=./pty4j-0.11.4.jar -DgroupId=org.jetbrains.pty4j -DartifactId=pty4j -Dversion=0.11.4 -Dpackaging=jar + echo "Install pty4j success" + popd + - name: Install purejavacomm + run: | + echo "Start install purejavacomm" + pushd import + echo "Current dir is "`pwd` + mvn install:install-file -Dfile=./purejavacomm-0.0.11.1.jar -DgroupId=org.jetbrains.pty4j -DartifactId=purejavacomm -Dversion=0.0.11.1 -Dpackaging=jar + echo "Install purejavacomm success" + popd - name: Build project run: mvn clean install -Dmaven.test.skip=true - name: Run PMD scan diff --git a/.github/workflows/build_release.yaml b/.github/workflows/build_release.yaml index 4311b62953..d9ae99a8b7 100644 --- a/.github/workflows/build_release.yaml +++ b/.github/workflows/build_release.yaml @@ -63,6 +63,22 @@ jobs: java-version: "8" distribution: "temurin" cache: maven + - name: Install pty4j + run: | + echo "Start install pty4j" + pushd import + echo "Current dir is "`pwd` + mvn install:install-file -Dfile=./pty4j-0.11.4.jar -DgroupId=org.jetbrains.pty4j -DartifactId=pty4j -Dversion=0.11.4 -Dpackaging=jar + echo "Install pty4j success" + popd + - name: Install purejavacomm + run: | + echo "Start install purejavacomm" + pushd import + echo "Current dir is "`pwd` + mvn install:install-file -Dfile=./purejavacomm-0.0.11.1.jar -DgroupId=org.jetbrains.pty4j -DartifactId=purejavacomm -Dversion=0.0.11.1 -Dpackaging=jar + echo "Install purejavacomm success" + popd - name: Build project run: mvn clean install -Dmaven.test.skip=true - name: Run PMD scan diff --git a/client b/client index 5db658d7bf..cdd7e97d3f 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit 5db658d7bfba1b1471301be3c1144b0c22a75020 +Subproject commit cdd7e97d3f030501f356ed104445fef11561ebcd diff --git a/script/functions.sh b/script/functions.sh index df613b5013..83c2e9c8f1 100755 --- a/script/functions.sh +++ b/script/functions.sh @@ -320,8 +320,28 @@ function maven_install_libs() { fi done - func_echo "maven install libs with args ${maven_extra_args[@]} succeed" popd + pushd "${ODC_DIR}/import" || return 1 + + func_echo "start install lib pty4j-0.11.4.jar" + + if ! mvn install:install-file -Dfile=./pty4j-0.11.4.jar -DgroupId=org.jetbrains.pty4j -DartifactId=pty4j -Dversion=0.11.4 -Dpackaging=jar; then + func_echo "maven install lib pty4j-0.11.4.jar failed" + else + func_echo "maven install lib pty4j-0.11.4.jar succeed" + fi + + func_echo "start install lib purejavacomm-0.0.11.1.jar" + + if ! mvn install:install-file -Dfile=./purejavacomm-0.0.11.1.jar -DgroupId=org.jetbrains.pty4j -DartifactId=purejavacomm -Dversion=0.0.11.1 -Dpackaging=jar; then + func_echo "maven install lib purejavacomm-0.0.11.1.jar failed" + else + func_echo "maven install lib purejavacomm-0.0.11.1.jar succeed" + fi + + popd + func_echo "maven install libs with args ${maven_extra_args[@]} succeed" + return 0 } diff --git a/server/odc-service/pom.xml b/server/odc-service/pom.xml index 078437e99f..04b3102eff 100644 --- a/server/odc-service/pom.xml +++ b/server/odc-service/pom.xml @@ -20,15 +20,11 @@ org.jetbrains.pty4j pty4j 0.11.4 - system - ${project.basedir}/../../import/pty4j-0.11.4.jar org.jetbrains.pty4j purejavacomm 0.0.11.1 - system - ${project.basedir}/../../import/purejavacomm-0.0.11.1.jar org.jetbrains