This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch revert-4448-master in repository https://gitbox.apache.org/repos/asf/linkis.git
commit 9407924c0232c8dfaa7ec831200c9655694961a8 Author: peacewong <[email protected]> AuthorDate: Sat Apr 8 23:37:46 2023 +0800 Revert "sync master to dev-1.4.0" --- .asf.yaml | 5 ++--- .../src/test/resources/application.properties | 13 +++++++++++-- .../src/test/resources/application.properties | 13 +++++++++++-- .../src/test/resources/application.properties | 13 +++++++++++-- .../src/test/resources/application.properties | 13 +++++++++++-- .../src/test/resources/application.properties | 13 +++++++++++-- .../src/test/resources/application.properties | 13 +++++++++++-- 7 files changed, 68 insertions(+), 15 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 9cf185a39..86e1aea98 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -65,7 +65,7 @@ github: required_pull_request_reviews: dismiss_stale_reviews: true required_approving_review_count: 2 - dev-1.4.0: + dev-1.3.2: required_status_checks: strict: true required_pull_request_reviews: @@ -74,5 +74,4 @@ github: notifications: commits: [email protected] issues: [email protected] - pullrequests: [email protected] - + pullrequests: [email protected] \ No newline at end of file diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties index ea61409ea..59651dc3a 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties +++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/test/resources/application.properties @@ -18,10 +18,19 @@ #h2 database config spring.datasource.driver-class-name=org.h2.Driver #init -spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true +spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:create.sql' spring.datasource.username=sa spring.datasource.password= -spring.datasource.schema=classpath:create.sql +spring.datasource.hikari.connection-test-query=select 1 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.auto-commit=true +spring.datasource.hikari.validation-timeout=3000 +spring.datasource.hikari.pool-name=linkis-test +spring.datasource.hikari.maximum-pool-size=50 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.leak-detection-threshold=0 +spring.datasource.hikari.initialization-fail-timeout=1 mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties index bd21d6250..fee53af98 100644 --- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties +++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties @@ -18,10 +18,19 @@ #h2 database config spring.datasource.driver-class-name=org.h2.Driver #init -spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true +spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:create.sql' spring.datasource.username=sa spring.datasource.password= -spring.datasource.schema=classpath:create.sql +spring.datasource.hikari.connection-test-query=select 1 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.auto-commit=true +spring.datasource.hikari.validation-timeout=3000 +spring.datasource.hikari.pool-name=linkis-test +spring.datasource.hikari.maximum-pool-size=50 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.leak-detection-threshold=0 +spring.datasource.hikari.initialization-fail-timeout=1 mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml mybatis-plus.type-aliases-package=org.apache.linkis.bml.ntity diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties index 7c39be685..b9ed613e6 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties @@ -31,10 +31,19 @@ wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configur #debug=true spring.datasource.driver-class-name=org.h2.Driver -spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true +spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:create.sql' spring.datasource.username=sa spring.datasource.password= -spring.datasource.schema=classpath:create.sql +spring.datasource.hikari.connection-test-query=select 1 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.auto-commit=true +spring.datasource.hikari.validation-timeout=3000 +spring.datasource.hikari.pool-name=linkis-test +spring.datasource.hikari.maximum-pool-size=50 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.leak-detection-threshold=0 +spring.datasource.hikari.initialization-fail-timeout=1 spring.main.web-application-type=servlet server.port=1234 diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/test/resources/application.properties b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/test/resources/application.properties index e1e01638a..c2c826c38 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/test/resources/application.properties +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/test/resources/application.properties @@ -31,10 +31,19 @@ wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configur #debug=true spring.datasource.driver-class-name=org.h2.Driver -spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true +spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:create.sql' spring.datasource.username=sa spring.datasource.password= -spring.datasource.schema=classpath:create.sql +spring.datasource.hikari.connection-test-query=select 1 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.auto-commit=true +spring.datasource.hikari.validation-timeout=3000 +spring.datasource.hikari.pool-name=linkis-test +spring.datasource.hikari.maximum-pool-size=50 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.leak-detection-threshold=0 +spring.datasource.hikari.initialization-fail-timeout=1 spring.main.web-application-type=servlet server.port=1234 diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties index 69a7c1446..6db0204f8 100644 --- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties +++ b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties @@ -18,10 +18,19 @@ #h2 database config spring.datasource.driver-class-name=org.h2.Driver #init -spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true +spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:create.sql' spring.datasource.username=sa spring.datasource.password= -spring.datasource.schema=classpath:create.sql +spring.datasource.hikari.connection-test-query=select 1 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.auto-commit=true +spring.datasource.hikari.validation-timeout=3000 +spring.datasource.hikari.pool-name=linkis-test +spring.datasource.hikari.maximum-pool-size=50 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.leak-detection-threshold=0 +spring.datasource.hikari.initialization-fail-timeout=1 mybatis-plus.mapper-locations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml mybatis-plus.type-aliases-package=org.apache.linkis.instance.label.entity diff --git a/linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties b/linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties index e67e49db0..88aba0128 100644 --- a/linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties +++ b/linkis-public-enhancements/linkis-jobhistory/src/test/resources/application.properties @@ -31,10 +31,19 @@ wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configur #debug=true spring.datasource.driver-class-name=org.h2.Driver -spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true +spring.datasource.url=jdbc:h2:mem:test;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:create.sql' spring.datasource.username=sa spring.datasource.password= -spring.datasource.schema=classpath:create.sql +spring.datasource.hikari.connection-test-query=select 1 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.auto-commit=true +spring.datasource.hikari.validation-timeout=3000 +spring.datasource.hikari.pool-name=linkis-test +spring.datasource.hikari.maximum-pool-size=50 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.leak-detection-threshold=0 +spring.datasource.hikari.initialization-fail-timeout=1 spring.main.web-application-type=servlet server.port=1234 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
