From aaddae9b43990b149c5d81c85ce286e59051522d Mon Sep 17 00:00:00 2001 From: mnhnam-axonivy Date: Tue, 10 Dec 2024 17:41:54 +0700 Subject: [PATCH 1/3] IVYPORTAL-18067 Create Portal branch release/12.0 - Updated builds - Increase version to 12.0.1-SNAPSHOT --- AxonIvyPortal/PortalApp/.project | 11 +++++++++++ AxonIvyPortal/PortalApp/pom.xml | 6 +++--- AxonIvyPortal/PortalKitTestHelper/.project | 13 ++++++++++++- AxonIvyPortal/PortalKitTestHelper/pom.xml | 4 ++-- AxonIvyPortal/portal-components/.project | 13 ++++++++++++- AxonIvyPortal/portal-components/pom.xml | 2 +- AxonIvyPortal/portal-migration/.project | 11 +++++++++++ AxonIvyPortal/portal-product/pom.xml | 2 +- AxonIvyPortal/portal-selenium-test/.project | 13 ++++++++++++- .../portal-selenium-test/customized_pom.xml | 4 ++-- .../document_screenshot_pom.xml | 4 ++-- AxonIvyPortal/portal-selenium-test/pom.xml | 4 ++-- AxonIvyPortal/portal/.project | 13 ++++++++++++- AxonIvyPortal/portal/pom.xml | 4 ++-- Documentation/maven/pom.xml | 2 +- Documentation/public-api/pom.xml | 2 +- Showcase/InternalSupport/.project | 13 ++++++++++++- Showcase/InternalSupport/pom.xml | 4 ++-- Showcase/portal-components-examples/.project | 13 ++++++++++++- Showcase/portal-components-examples/pom.xml | 4 ++-- Showcase/portal-demo-app/.project | 11 +++++++++++ Showcase/portal-demo-app/pom.xml | 6 +++--- Showcase/portal-developer-examples/.project | 13 ++++++++++++- Showcase/portal-developer-examples/pom.xml | 4 ++-- Showcase/portal-user-examples/.project | 13 ++++++++++++- Showcase/portal-user-examples/pom.xml | 4 ++-- build/ci/Jenkinsfile | 2 +- build/create-release/Jenkinsfile | 2 +- build/document-screenshot-selenide/Jenkinsfile | 9 ++++----- build/gui-test-new-dashboard/Jenkinsfile | 3 +-- build/integration/Jenkinsfile | 3 +-- build/performance-test/Jenkinsfile | 6 +++--- build/update-pom/Jenkinsfile | 11 +++++------ build/upgrade-engine/Jenkinsfile | 6 +++--- 34 files changed, 176 insertions(+), 59 deletions(-) diff --git a/AxonIvyPortal/PortalApp/.project b/AxonIvyPortal/PortalApp/.project index 78132b2a61b..e229d7a1998 100644 --- a/AxonIvyPortal/PortalApp/.project +++ b/AxonIvyPortal/PortalApp/.project @@ -14,4 +14,15 @@ org.eclipse.m2e.core.maven2Nature + + + 1733824570217 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/AxonIvyPortal/PortalApp/pom.xml b/AxonIvyPortal/PortalApp/pom.xml index 7bfa67edcbc..9793c0964c1 100644 --- a/AxonIvyPortal/PortalApp/pom.xml +++ b/AxonIvyPortal/PortalApp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.axonivy.portal portal-app - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT pom @@ -27,13 +27,13 @@ com.axonivy.portal portal-components - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar com.axonivy.portal portal - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/AxonIvyPortal/PortalKitTestHelper/.project b/AxonIvyPortal/PortalKitTestHelper/.project index 85a552a5206..61b7a8e07ab 100644 --- a/AxonIvyPortal/PortalKitTestHelper/.project +++ b/AxonIvyPortal/PortalKitTestHelper/.project @@ -50,4 +50,15 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - \ No newline at end of file + + + 1733824570253 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/AxonIvyPortal/PortalKitTestHelper/pom.xml b/AxonIvyPortal/PortalKitTestHelper/pom.xml index 9b1856defa9..a8b7493d3be 100644 --- a/AxonIvyPortal/PortalKitTestHelper/pom.xml +++ b/AxonIvyPortal/PortalKitTestHelper/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.axonivy.portal portalKitTestHelper - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar 12.0.1 @@ -15,7 +15,7 @@ com.axonivy.portal portal - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/AxonIvyPortal/portal-components/.project b/AxonIvyPortal/portal-components/.project index d0781ced64d..f2dc20436fb 100644 --- a/AxonIvyPortal/portal-components/.project +++ b/AxonIvyPortal/portal-components/.project @@ -50,4 +50,15 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - \ No newline at end of file + + + 1733824570220 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/AxonIvyPortal/portal-components/pom.xml b/AxonIvyPortal/portal-components/pom.xml index 7f1813bde05..419d41548f7 100644 --- a/AxonIvyPortal/portal-components/pom.xml +++ b/AxonIvyPortal/portal-components/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.axonivy.portal portal-components - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/AxonIvyPortal/portal-migration/.project b/AxonIvyPortal/portal-migration/.project index 6250f6dda1a..68a5245bf07 100644 --- a/AxonIvyPortal/portal-migration/.project +++ b/AxonIvyPortal/portal-migration/.project @@ -51,4 +51,15 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.jsdt.core.jsNature + + + 1733824570236 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/AxonIvyPortal/portal-product/pom.xml b/AxonIvyPortal/portal-product/pom.xml index 86f1e4da881..dd7e96188cc 100644 --- a/AxonIvyPortal/portal-product/pom.xml +++ b/AxonIvyPortal/portal-product/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.axonivy.portal portal-product - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT pom diff --git a/AxonIvyPortal/portal-selenium-test/.project b/AxonIvyPortal/portal-selenium-test/.project index d7a7d7bad78..1272cadd748 100644 --- a/AxonIvyPortal/portal-selenium-test/.project +++ b/AxonIvyPortal/portal-selenium-test/.project @@ -50,4 +50,15 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - \ No newline at end of file + + + 1733824570244 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/AxonIvyPortal/portal-selenium-test/customized_pom.xml b/AxonIvyPortal/portal-selenium-test/customized_pom.xml index 09309492b2a..dd6f33ba531 100644 --- a/AxonIvyPortal/portal-selenium-test/customized_pom.xml +++ b/AxonIvyPortal/portal-selenium-test/customized_pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.axonivy.portal portal-selenium-test - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar 12.0.0-SNAPSHOT @@ -14,7 +14,7 @@ com.axonivy.portal portal - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml b/AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml index 09bffcb6333..1f47851fa0e 100644 --- a/AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml +++ b/AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.axonivy.portal portal-document-screenshots-selenide - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT pom 12.0.0-SNAPSHOT @@ -24,7 +24,7 @@ com.axonivy.portal portal - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/AxonIvyPortal/portal-selenium-test/pom.xml b/AxonIvyPortal/portal-selenium-test/pom.xml index 9b533775639..0e39aa996c4 100644 --- a/AxonIvyPortal/portal-selenium-test/pom.xml +++ b/AxonIvyPortal/portal-selenium-test/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.axonivy.portal portal-selenium-test - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar 12.0.1 @@ -21,7 +21,7 @@ com.axonivy.portal portal - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/AxonIvyPortal/portal/.project b/AxonIvyPortal/portal/.project index 28705c440c7..619673936bc 100644 --- a/AxonIvyPortal/portal/.project +++ b/AxonIvyPortal/portal/.project @@ -50,4 +50,15 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - \ No newline at end of file + + + 1733824570212 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/AxonIvyPortal/portal/pom.xml b/AxonIvyPortal/portal/pom.xml index 5c7f9309e22..23c785ff23c 100644 --- a/AxonIvyPortal/portal/pom.xml +++ b/AxonIvyPortal/portal/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.axonivy.portal portal - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar @@ -25,7 +25,7 @@ com.axonivy.portal portal-components - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/Documentation/maven/pom.xml b/Documentation/maven/pom.xml index c44488c518c..36df5af6389 100644 --- a/Documentation/maven/pom.xml +++ b/Documentation/maven/pom.xml @@ -7,7 +7,7 @@ ${revision} - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT diff --git a/Documentation/public-api/pom.xml b/Documentation/public-api/pom.xml index 5bea3c50dc9..7597ce00e28 100644 --- a/Documentation/public-api/pom.xml +++ b/Documentation/public-api/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.axonivy.portal public-api - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT 12.0.0 12.0.0 diff --git a/Showcase/InternalSupport/.project b/Showcase/InternalSupport/.project index 2528daddb84..559d914280f 100644 --- a/Showcase/InternalSupport/.project +++ b/Showcase/InternalSupport/.project @@ -50,4 +50,15 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - \ No newline at end of file + + + 1733824570206 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/Showcase/InternalSupport/pom.xml b/Showcase/InternalSupport/pom.xml index 6a74a3701a5..3c943cc83e0 100644 --- a/Showcase/InternalSupport/pom.xml +++ b/Showcase/InternalSupport/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.axonivy.portal internalSupport - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar 12.0.0-SNAPSHOT @@ -22,7 +22,7 @@ com.axonivy.portal portal-developer-examples - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/Showcase/portal-components-examples/.project b/Showcase/portal-components-examples/.project index fec881a12ac..1debf847dac 100644 --- a/Showcase/portal-components-examples/.project +++ b/Showcase/portal-components-examples/.project @@ -50,4 +50,15 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - \ No newline at end of file + + + 1733824570223 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/Showcase/portal-components-examples/pom.xml b/Showcase/portal-components-examples/pom.xml index 076878621ed..45a4dbacda1 100644 --- a/Showcase/portal-components-examples/pom.xml +++ b/Showcase/portal-components-examples/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.axonivy.portal portal-components-examples - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar @@ -25,7 +25,7 @@ com.axonivy.portal portal-components - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/Showcase/portal-demo-app/.project b/Showcase/portal-demo-app/.project index 11dbfd10a8b..bc6084d8341 100644 --- a/Showcase/portal-demo-app/.project +++ b/Showcase/portal-demo-app/.project @@ -14,4 +14,15 @@ org.eclipse.m2e.core.maven2Nature + + + 1733824570227 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/Showcase/portal-demo-app/pom.xml b/Showcase/portal-demo-app/pom.xml index 4d024a70838..1c4d9de11b9 100644 --- a/Showcase/portal-demo-app/pom.xml +++ b/Showcase/portal-demo-app/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.axonivy.portal portal-demo-app - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT pom @@ -27,13 +27,13 @@ com.axonivy.portal portal-user-examples - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar com.axonivy.portal portal - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/Showcase/portal-developer-examples/.project b/Showcase/portal-developer-examples/.project index 2cba8d39d10..e183c4b82f9 100644 --- a/Showcase/portal-developer-examples/.project +++ b/Showcase/portal-developer-examples/.project @@ -50,4 +50,15 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - \ No newline at end of file + + + 1733824570231 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/Showcase/portal-developer-examples/pom.xml b/Showcase/portal-developer-examples/pom.xml index 470188c062f..2c9738d841f 100644 --- a/Showcase/portal-developer-examples/pom.xml +++ b/Showcase/portal-developer-examples/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.axonivy.portal portal-developer-examples - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar @@ -25,7 +25,7 @@ com.axonivy.portal portal-components - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/Showcase/portal-user-examples/.project b/Showcase/portal-user-examples/.project index 31cbfc6a393..1becde588f4 100644 --- a/Showcase/portal-user-examples/.project +++ b/Showcase/portal-user-examples/.project @@ -50,4 +50,15 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - \ No newline at end of file + + + 1733824570249 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/Showcase/portal-user-examples/pom.xml b/Showcase/portal-user-examples/pom.xml index 20e8b2c6f51..f61b82a5282 100644 --- a/Showcase/portal-user-examples/pom.xml +++ b/Showcase/portal-user-examples/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.axonivy.portal portal-user-examples - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar @@ -25,7 +25,7 @@ com.axonivy.portal portal-components - 9.1.0.0-SNAPSHOT + 12.0.2-SNAPSHOT iar diff --git a/build/ci/Jenkinsfile b/build/ci/Jenkinsfile index f4705b8bddb..670a3530827 100644 --- a/build/ci/Jenkinsfile +++ b/build/ci/Jenkinsfile @@ -44,7 +44,7 @@ pipeline { script { def buildPluginVersion = readMavenPom(file: 'AxonIvyPortal/portal-components/pom.xml').getProperties().getProperty("build.plugin.version") def utils = load 'build/common/utils.groovy' - def engineUrl = 'http://' + utils.getJenkinsMasterDomain() + ':8000' + def engineUrl = 'http://' + utils.getJenkinsMasterDomain() + ':8012' docker.build('deploy-modules-to-engine', '-f build/Dockerfile .').inside('-v /var/tools/maven-cache:/home/build/') { for (module in builtModules) { maven cmd: "com.axonivy.ivy.ci:project-build-plugin:${buildPluginVersion}:deploy-to-engine -f ${module}/pom.xml -Divy.deploy.server.id=engine-cockpit -Divy.deploy.engine.app=Portal -Divy.deploy.method=HTTP -Divy.deploy.engine.url=${engineUrl} -Divy.test.engine=MODIFY_EXISTING -Divy.deploy.test.users=true" diff --git a/build/create-release/Jenkinsfile b/build/create-release/Jenkinsfile index fcbb4b505d6..1b7fb8997ad 100644 --- a/build/create-release/Jenkinsfile +++ b/build/create-release/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { parameters { string(name: 'releaseVersion', defaultValue: '1.0.0-m1', description: 'The release version.') string(name: 'engineDownloadURL', defaultValue: '-Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly-12.0/axonivy-engine-windows.zip', description: '''Where to download engine? e.g. - -Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly/axonivy-engine-windows.zip for nightly master + -Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly-12/axonivy-engine-windows.zip for nightly 12 -Divy.engine.download.url=https://developer.axonivy.com/permalink/dev/axonivy-engine-windows.zip for dev master -Divy.engine.download.url=file:///C:/wawa/engine/AxonIvyEngineX.X.X.X_Windows_x64.zip for downloaded engine -Divy.engine.list.url=https://jenkins.ivyteam.io/job/core_product/job/release%252F9.4/lastSuccessfulBuild/artifact/workspace/ch.ivyteam.ivy.server.product/target/products/ -Divy.engine.os.arch=Windows_x64 for last successful build 9.4 diff --git a/build/document-screenshot-selenide/Jenkinsfile b/build/document-screenshot-selenide/Jenkinsfile index 7d77ac2d8b7..e9032f1a4dc 100644 --- a/build/document-screenshot-selenide/Jenkinsfile +++ b/build/document-screenshot-selenide/Jenkinsfile @@ -17,8 +17,7 @@ pipeline { parameters { string(name: 'testPatternToRun', defaultValue: 'com.axonivy.portal.selenium.document.screenshot.*Test', description: 'Test pattern to run') string(name: 'engineDownloadURL', defaultValue: '-Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly-12.0/axonivy-engine-windows.zip', description: '''Where to download engine? e.g. - -Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly/axonivy-engine-windows.zip for nightly master - -Divy.engine.download.url=https://developer.axonivy.com/permalink/dev/axonivy-engine-windows.zip for dev master + -Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly-12/axonivy-engine-windows.zip for nightly 12 -Divy.engine.download.url=file:///C:/wawa/engine/AxonIvyEngineX.X.X.X_Windows_x64.zip for downloaded engine -Divy.engine.list.url=https://jenkins.ivyteam.io/job/core_product/job/release%252F9.4/lastSuccessfulBuild/artifact/workspace/ch.ivyteam.ivy.server.product/target/products/ -Divy.engine.os.arch=Windows_x64 for last successful build 9.4 ''') @@ -90,9 +89,9 @@ pipeline { bat "mvn clean install -f AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml %engineDownloadURL% -Dtest=${params.testPatternToRun} -DbrowserType=FIREFOX -DtrimStackTrace=false -Divy.engine.directory=%engineDir% -Divy.deploy.timeout.seconds=60 -Divy.engine.start.timeout.seconds=500" utils.cleanDisk() - echo '====================Copy ElasticSearch log====================' + echo '====================Copy OpenSearch log====================' powershell ''' - $LOG= $env:engineDir + "/elasticsearch/logs/ivy-elasticsearch-*.log" + $LOG= $env:engineDir + "/logs/opensearch/ivy-opensearch-*.log" Copy-Item $LOG -Destination AxonIvyPortal/portal-selenium-test/target ''' if (params.useForDocumentation) { @@ -109,7 +108,7 @@ pipeline { post { always { archiveArtifacts artifacts: 'AxonIvyPortal/portal-selenium-test/target/*.zip', allowEmptyArchive: true - archiveArtifacts artifacts: 'AxonIvyPortal/portal-selenium-test/target/selenide/reports/**/*.*, AxonIvyPortal/portal-selenium-test/target/testEngineOut.log, AxonIvyPortal/portal-selenium-test/target/ivy-elasticsearch-*.log', allowEmptyArchive: true + archiveArtifacts artifacts: 'AxonIvyPortal/portal-selenium-test/target/selenide/reports/**/*.*, AxonIvyPortal/portal-selenium-test/target/testEngineOut.log, AxonIvyPortal/portal-selenium-test/target/ivy-opensearch-*.log', allowEmptyArchive: true junit allowEmptyResults: true, testResults: '**/surefire-reports/TEST-*.xml' } } diff --git a/build/gui-test-new-dashboard/Jenkinsfile b/build/gui-test-new-dashboard/Jenkinsfile index 8ce96f24e30..82b19ebb758 100644 --- a/build/gui-test-new-dashboard/Jenkinsfile +++ b/build/gui-test-new-dashboard/Jenkinsfile @@ -18,8 +18,7 @@ pipeline { parameters { string(name: 'testPatternToRun', defaultValue: 'com.axonivy.portal.selenium.test.**.*Test', description: 'Test pattern to run') string(name: 'engineDownloadURL', defaultValue: '-Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly-12.0/axonivy-engine-windows.zip', description: '''Where to download engine? e.g. - -Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly/axonivy-engine-windows.zip for nightly master - -Divy.engine.download.url=https://developer.axonivy.com/permalink/dev/axonivy-engine-windows.zip for dev master + -Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly-12/axonivy-engine-windows.zip for nightly 12 -Divy.engine.download.url=file:///C:/wawa/engine/AxonIvyEngineX.X.X.X_Windows_x64.zip for downloaded engine -Divy.engine.list.url=https://jenkins.ivyteam.io/job/core_product/job/release%252F9.4/lastSuccessfulBuild/artifact/workspace/ch.ivyteam.ivy.server.product/target/products/ -Divy.engine.os.arch=Windows_x64 for last successful build 9.4 ''') diff --git a/build/integration/Jenkinsfile b/build/integration/Jenkinsfile index cd2ef537aaa..9d299cae280 100644 --- a/build/integration/Jenkinsfile +++ b/build/integration/Jenkinsfile @@ -13,8 +13,7 @@ pipeline { parameters { string(name: 'testPatternToRun', defaultValue: 'com.axonivy.portal.selenium.test.**.*Test', description: 'Test pattern to run') string(name: 'engineDownloadURL', defaultValue: '-Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly-12.0/axonivy-engine-windows.zip', description: '''Where to download engine? e.g. - -Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly/axonivy-engine-windows.zip for nightly master - -Divy.engine.download.url=https://developer.axonivy.com/permalink/dev/axonivy-engine-windows.zip for dev master + -Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly-12/axonivy-engine-windows.zip for nightly 12 -Divy.engine.download.url=file:///C:/wawa/engine/AxonIvyEngineX.X.X.X_Windows_x64.zip for downloaded engine -Divy.engine.list.url=https://jenkins.ivyteam.io/job/core_product/job/release%252F9.4/lastSuccessfulBuild/artifact/workspace/ch.ivyteam.ivy.server.product/target/products/ -Divy.engine.os.arch=Windows_x64 for last successful build 9.4 ''') diff --git a/build/performance-test/Jenkinsfile b/build/performance-test/Jenkinsfile index 0cfc23993ec..fdadb112f34 100644 --- a/build/performance-test/Jenkinsfile +++ b/build/performance-test/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } environment { - engineVersion = 'master' + engineVersion = '12' jmeterSourceDir = 'AxonIvyPortal/portal-selenium-test/jmeter' ivyDir = '/var/tools/ivy' } @@ -20,7 +20,7 @@ pipeline { steps { script { currentBuild.description = "On ${env.NODE_NAME}" - engineNames = ['master', '10', '8', 'performance-master', 'performance-10', 'performance-8'] + engineNames = ['master', '12', '10', '8', 'performance-master', 'performance-12', 'performance-10', 'performance-8'] for (engineName in engineNames) { sh "docker compose -f ${ivyDir}/${engineName}/docker-compose.yml down" } @@ -34,7 +34,7 @@ pipeline { def modules = ['AxonIvyPortal/portal-components', 'AxonIvyPortal/portal'] def buildPluginVersion = readMavenPom(file: 'AxonIvyPortal/portal-components/pom.xml').getProperties().getProperty('build.plugin.version') def utils = load 'build/common/utils.groovy' - def engineUrl = 'http://' + utils.getJenkinsMasterDomain() + ':9000' + def engineUrl = 'http://' + utils.getJenkinsMasterDomain() + ':9012' for (module in modules) { maven cmd: "clean install -f ${module}/pom.xml" maven cmd: "com.axonivy.ivy.ci:project-build-plugin:${buildPluginVersion}:deploy-to-engine -f ${module}/pom.xml -Divy.deploy.server.id=engine-cockpit -Divy.deploy.engine.app=Portal -Divy.deploy.method=HTTP -Divy.deploy.engine.url=${engineUrl} -Divy.test.engine=MODIFY_EXISTING" diff --git a/build/update-pom/Jenkinsfile b/build/update-pom/Jenkinsfile index 67276df531b..1fcbb2b5651 100644 --- a/build/update-pom/Jenkinsfile +++ b/build/update-pom/Jenkinsfile @@ -8,12 +8,11 @@ pipeline { } parameters { - string(name: 'buildPluginVersion', defaultValue: '10.0.1', description: 'Axon Ivy build plugin version of all pom will be updated to.') - string(name: 'ivyEngineVersion', defaultValue: '11.1.0', description: 'Axon Ivy engine version of all pom will be updated to.') - string(name: 'branchToPush', defaultValue: 'portal-update-pom/master', description: 'Branch name to push changes. It must not be protected branches. After this build, create a pull request to merge to master') - string(name: 'engineDownloadURL', defaultValue: '-Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly-12.0/axonivy-engine.zip', description: '''Where to download engine? e.g. - -Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly/axonivy-engine.zip for nightly master - -Divy.engine.download.url=https://developer.axonivy.com/permalink/dev/axonivy-engine.zip for dev master + string(name: 'buildPluginVersion', defaultValue: '12.0.0', description: 'Axon Ivy build plugin version of all pom will be updated to.') + string(name: 'ivyEngineVersion', defaultValue: '12.0.0', description: 'Axon Ivy engine version of all pom will be updated to.') + string(name: 'branchToPush', defaultValue: 'portal-update-pom/12.0', description: 'Branch name to push changes. It must not be protected branches. After this build, create a pull request to merge to release/12.0') + string(name: 'engineDownloadURL', defaultValue: '-Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly-12/axonivy-engine.zip', description: '''Where to download engine? e.g. + -Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly-12/axonivy-engine.zip for nightly 12 ''') } diff --git a/build/upgrade-engine/Jenkinsfile b/build/upgrade-engine/Jenkinsfile index c4079770fbb..455b0a86861 100644 --- a/build/upgrade-engine/Jenkinsfile +++ b/build/upgrade-engine/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { } parameters { - choice(name: 'engine', choices: ['master','performanceTest'], description: 'Engine to choose e.g. master') + choice(name: 'engine', choices: ['portal','performanceTest'], description: 'Engine to choose e.g. 12') } stages { @@ -17,8 +17,8 @@ pipeline { script { currentBuild.description = "On ${env.NODE_NAME}" today = new Date().format('dd-MM-yyyy_HH-mm') - config = [master:[engine: 'master', systemDatabase: 'AxonIvySystemDatabase-master'], - performanceTest:[engine:'performance-master', systemDatabase: 'AxonIvySystemDatabase-performance-master']] + config = [portal:[engine: '12', systemDatabase: 'AxonIvySystemDatabase-12'], + performanceTest:[engine:'performance-12', systemDatabase: 'AxonIvySystemDatabase-performance-12']] engineParentDir = '/var/tools/ivy/' engineDir = engineParentDir + config[params.engine]['engine'] databaseBackupDir = '/var/database-backups/' From 0d875e2a126102f183318c2c3a328894fda9f21b Mon Sep 17 00:00:00 2001 From: mnhnam-axonivy Date: Tue, 10 Dec 2024 18:05:32 +0700 Subject: [PATCH 2/3] IVYPORTAL-18067 Create Portal branch release/12.0 - Reverted unnecessary changes --- AxonIvyPortal/PortalApp/.project | 11 ----------- AxonIvyPortal/PortalKitTestHelper/.project | 11 ----------- AxonIvyPortal/portal-components/.project | 11 ----------- AxonIvyPortal/portal-migration/.project | 11 ----------- AxonIvyPortal/portal-selenium-test/.project | 11 ----------- AxonIvyPortal/portal/.project | 11 ----------- Showcase/InternalSupport/.project | 11 ----------- Showcase/portal-components-examples/.project | 11 ----------- Showcase/portal-demo-app/.project | 11 ----------- Showcase/portal-developer-examples/.project | 11 ----------- Showcase/portal-user-examples/.project | 11 ----------- 11 files changed, 121 deletions(-) diff --git a/AxonIvyPortal/PortalApp/.project b/AxonIvyPortal/PortalApp/.project index e229d7a1998..78132b2a61b 100644 --- a/AxonIvyPortal/PortalApp/.project +++ b/AxonIvyPortal/PortalApp/.project @@ -14,15 +14,4 @@ org.eclipse.m2e.core.maven2Nature - - - 1733824570217 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/AxonIvyPortal/PortalKitTestHelper/.project b/AxonIvyPortal/PortalKitTestHelper/.project index 61b7a8e07ab..e95a1782e8e 100644 --- a/AxonIvyPortal/PortalKitTestHelper/.project +++ b/AxonIvyPortal/PortalKitTestHelper/.project @@ -50,15 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - - - 1733824570253 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/AxonIvyPortal/portal-components/.project b/AxonIvyPortal/portal-components/.project index f2dc20436fb..27ea051b78f 100644 --- a/AxonIvyPortal/portal-components/.project +++ b/AxonIvyPortal/portal-components/.project @@ -50,15 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - - - 1733824570220 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/AxonIvyPortal/portal-migration/.project b/AxonIvyPortal/portal-migration/.project index 68a5245bf07..6250f6dda1a 100644 --- a/AxonIvyPortal/portal-migration/.project +++ b/AxonIvyPortal/portal-migration/.project @@ -51,15 +51,4 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.jsdt.core.jsNature - - - 1733824570236 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/AxonIvyPortal/portal-selenium-test/.project b/AxonIvyPortal/portal-selenium-test/.project index 1272cadd748..6c908184903 100644 --- a/AxonIvyPortal/portal-selenium-test/.project +++ b/AxonIvyPortal/portal-selenium-test/.project @@ -50,15 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - - - 1733824570244 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/AxonIvyPortal/portal/.project b/AxonIvyPortal/portal/.project index 619673936bc..65970faab44 100644 --- a/AxonIvyPortal/portal/.project +++ b/AxonIvyPortal/portal/.project @@ -50,15 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - - - 1733824570212 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/Showcase/InternalSupport/.project b/Showcase/InternalSupport/.project index 559d914280f..ef1ec8ff9be 100644 --- a/Showcase/InternalSupport/.project +++ b/Showcase/InternalSupport/.project @@ -50,15 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - - - 1733824570206 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/Showcase/portal-components-examples/.project b/Showcase/portal-components-examples/.project index 1debf847dac..5d123a93a13 100644 --- a/Showcase/portal-components-examples/.project +++ b/Showcase/portal-components-examples/.project @@ -50,15 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - - - 1733824570223 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/Showcase/portal-demo-app/.project b/Showcase/portal-demo-app/.project index bc6084d8341..11dbfd10a8b 100644 --- a/Showcase/portal-demo-app/.project +++ b/Showcase/portal-demo-app/.project @@ -14,15 +14,4 @@ org.eclipse.m2e.core.maven2Nature - - - 1733824570227 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/Showcase/portal-developer-examples/.project b/Showcase/portal-developer-examples/.project index e183c4b82f9..5ee24f19a31 100644 --- a/Showcase/portal-developer-examples/.project +++ b/Showcase/portal-developer-examples/.project @@ -50,15 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - - - 1733824570231 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - diff --git a/Showcase/portal-user-examples/.project b/Showcase/portal-user-examples/.project index 1becde588f4..ced10e2de77 100644 --- a/Showcase/portal-user-examples/.project +++ b/Showcase/portal-user-examples/.project @@ -50,15 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - - - 1733824570249 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - From b204bf8c0f870767d39e1d9a370282b53cbabdba Mon Sep 17 00:00:00 2001 From: mnhnam-axonivy Date: Tue, 10 Dec 2024 18:11:06 +0700 Subject: [PATCH 3/3] IVYPORTAL-18067 Create Portal branch release/12.0 - Reverted unnecessary changes --- AxonIvyPortal/PortalApp/.project | 2 +- AxonIvyPortal/PortalKitTestHelper/.project | 2 +- AxonIvyPortal/portal-components/.project | 2 +- AxonIvyPortal/portal-migration/.project | 2 +- AxonIvyPortal/portal-selenium-test/.project | 2 +- AxonIvyPortal/portal/.project | 2 +- Documentation/maven/.project | 2 +- Documentation/portal-guide/.project | 2 +- Documentation/public-api/.project | 2 +- Showcase/InternalSupport/.project | 2 +- Showcase/portal-components-examples/.project | 2 +- Showcase/portal-demo-app/.project | 2 +- Showcase/portal-developer-examples/.project | 2 +- Showcase/portal-user-examples/.project | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/AxonIvyPortal/PortalApp/.project b/AxonIvyPortal/PortalApp/.project index 78132b2a61b..dce9fe2c688 100644 --- a/AxonIvyPortal/PortalApp/.project +++ b/AxonIvyPortal/PortalApp/.project @@ -14,4 +14,4 @@ org.eclipse.m2e.core.maven2Nature - + \ No newline at end of file diff --git a/AxonIvyPortal/PortalKitTestHelper/.project b/AxonIvyPortal/PortalKitTestHelper/.project index e95a1782e8e..85a552a5206 100644 --- a/AxonIvyPortal/PortalKitTestHelper/.project +++ b/AxonIvyPortal/PortalKitTestHelper/.project @@ -50,4 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - + \ No newline at end of file diff --git a/AxonIvyPortal/portal-components/.project b/AxonIvyPortal/portal-components/.project index 27ea051b78f..d0781ced64d 100644 --- a/AxonIvyPortal/portal-components/.project +++ b/AxonIvyPortal/portal-components/.project @@ -50,4 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - + \ No newline at end of file diff --git a/AxonIvyPortal/portal-migration/.project b/AxonIvyPortal/portal-migration/.project index 6250f6dda1a..2377d69516b 100644 --- a/AxonIvyPortal/portal-migration/.project +++ b/AxonIvyPortal/portal-migration/.project @@ -51,4 +51,4 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.jsdt.core.jsNature - + \ No newline at end of file diff --git a/AxonIvyPortal/portal-selenium-test/.project b/AxonIvyPortal/portal-selenium-test/.project index 6c908184903..d7a7d7bad78 100644 --- a/AxonIvyPortal/portal-selenium-test/.project +++ b/AxonIvyPortal/portal-selenium-test/.project @@ -50,4 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - + \ No newline at end of file diff --git a/AxonIvyPortal/portal/.project b/AxonIvyPortal/portal/.project index 65970faab44..28705c440c7 100644 --- a/AxonIvyPortal/portal/.project +++ b/AxonIvyPortal/portal/.project @@ -50,4 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - + \ No newline at end of file diff --git a/Documentation/maven/.project b/Documentation/maven/.project index 349c5cdb5d7..ac0babfd13b 100644 --- a/Documentation/maven/.project +++ b/Documentation/maven/.project @@ -14,4 +14,4 @@ org.eclipse.m2e.core.maven2Nature - + \ No newline at end of file diff --git a/Documentation/portal-guide/.project b/Documentation/portal-guide/.project index 23228040cf1..e61ebdf3c80 100644 --- a/Documentation/portal-guide/.project +++ b/Documentation/portal-guide/.project @@ -25,4 +25,4 @@ - + \ No newline at end of file diff --git a/Documentation/public-api/.project b/Documentation/public-api/.project index 5aa0423922d..1a238757460 100644 --- a/Documentation/public-api/.project +++ b/Documentation/public-api/.project @@ -4,4 +4,4 @@ - + \ No newline at end of file diff --git a/Showcase/InternalSupport/.project b/Showcase/InternalSupport/.project index ef1ec8ff9be..2528daddb84 100644 --- a/Showcase/InternalSupport/.project +++ b/Showcase/InternalSupport/.project @@ -50,4 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - + \ No newline at end of file diff --git a/Showcase/portal-components-examples/.project b/Showcase/portal-components-examples/.project index 5d123a93a13..fec881a12ac 100644 --- a/Showcase/portal-components-examples/.project +++ b/Showcase/portal-components-examples/.project @@ -50,4 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - + \ No newline at end of file diff --git a/Showcase/portal-demo-app/.project b/Showcase/portal-demo-app/.project index 11dbfd10a8b..10693cd7517 100644 --- a/Showcase/portal-demo-app/.project +++ b/Showcase/portal-demo-app/.project @@ -14,4 +14,4 @@ org.eclipse.m2e.core.maven2Nature - + \ No newline at end of file diff --git a/Showcase/portal-developer-examples/.project b/Showcase/portal-developer-examples/.project index 5ee24f19a31..2cba8d39d10 100644 --- a/Showcase/portal-developer-examples/.project +++ b/Showcase/portal-developer-examples/.project @@ -50,4 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - + \ No newline at end of file diff --git a/Showcase/portal-user-examples/.project b/Showcase/portal-user-examples/.project index ced10e2de77..31cbfc6a393 100644 --- a/Showcase/portal-user-examples/.project +++ b/Showcase/portal-user-examples/.project @@ -50,4 +50,4 @@ org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - + \ No newline at end of file