diff --git a/.ivy/raise-build-plugin-version.sh b/.ivy/raise-build-plugin-version.sh index 31d5f4f..9082710 100755 --- a/.ivy/raise-build-plugin-version.sh +++ b/.ivy/raise-build-plugin-version.sh @@ -1,3 +1,3 @@ #!/bin/bash -mvn -f 'pom.test.xml' --batch-mode versions:set-property versions:commit -Dproperty=project.build.plugin.version -DnewVersion=${2} -DallowSnapshots=true +mvn -f 'pom.test.xml' --batch-mode versions:set-property versions:commit -Dproperty=project.build.plugin.version -DnewVersion=${1} -DallowSnapshots=true diff --git a/build/release/Jenkinsfile b/build/release/Jenkinsfile index 7b32bd6..a98e8e1 100644 --- a/build/release/Jenkinsfile +++ b/build/release/Jenkinsfile @@ -25,8 +25,15 @@ pipeline { withCredentials([string(credentialsId: 'gpg.password.axonivy', variable: 'GPG_PWD'), file(credentialsId: 'gpg.keystore.axonivy', variable: 'GPG_FILE')]) { sh "gpg --batch --import ${env.GPG_FILE}" def dryRun = isReleaseBranch() ? '' : '-DdryRun=true' - def args = "-Dmaven.test.skip=true -Dengine.page.url=${params.engineSource} -Dskip.gpg=false -Dgpg.passphrase='${env.GPG_PWD}'"; - maven cmd: '--batch-mode ' + dryRun + ' -Darguments="' + args + '" -DpushChanges=false -DlocalCheckout=true release:prepare release:perform' + def reactorArgs = "-Dmaven.test.skip=true " + + "-Dengine.page.url=${params.engineSource} " + + "-Dskip.gpg=false " + + "-Dgpg.passphrase='${env.GPG_PWD}'" + def releaseArgs = "-DpomFileName=pom.test.xml " + + "-DautoVersionSubmodules=true " + + "-DpushChanges=false " + + "-DlocalCheckout=true" + maven cmd: '--batch-mode -f pom.test.xml ' + dryRun + ' -Darguments="' + reactorArgs + '" ' + releaseArgs + ' release:prepare release:perform' } withEnv(['GIT_SSH_COMMAND=ssh -o StrictHostKeyChecking=no']) { diff --git a/pom.test.xml b/pom.test.xml index c5c1240..9b43f1c 100644 --- a/pom.test.xml +++ b/pom.test.xml @@ -1,7 +1,13 @@ 4.0.0 - com.axonivy.ivy.webtest + + com.axonivy.ivy.webtest + web-config + 12.0.2-SNAPSHOT + maven-config + + web-test-module 12.0.2-SNAPSHOT pom diff --git a/web-tester-fixture/pom.xml b/web-tester-fixture/pom.xml index 544ab12..3191da8 100644 --- a/web-tester-fixture/pom.xml +++ b/web-tester-fixture/pom.xml @@ -7,7 +7,7 @@ 12.0.2-SNAPSHOT iar-integration-test - 12.0.1-SNAPSHOT + 12.0.0 https://product.ivyteam.io