Merge pull request #1296 from axonivy-market/feature/IVYPORTAL-18067-…

…Create-Portal-branch-release-12.0 IVYPORTAL-18067 Create Portal branch release/12.0
axonivy-market · Dec 20, 2024 · 59beeff · 59beeff
2 parents e80ce5c + b204bf8
commit 59beeff
Show file tree

Hide file tree

Showing 29 changed files with 53 additions and 57 deletions.
diff --git a/AxonIvyPortal/PortalApp/.project b/AxonIvyPortal/PortalApp/.project
@@ -14,4 +14,4 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
-</projectDescription>
+</projectDescription>
diff --git a/AxonIvyPortal/PortalApp/pom.xml b/AxonIvyPortal/PortalApp/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portal-app</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <distributionManagement>
     <repository>
@@ -27,13 +27,13 @@
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal-components</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
   </dependencies>

diff --git a/AxonIvyPortal/PortalKitTestHelper/pom.xml b/AxonIvyPortal/PortalKitTestHelper/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portalKitTestHelper</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
     <ivy.engine.version>12.0.2</ivy.engine.version>
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
   </dependencies>

diff --git a/AxonIvyPortal/portal-components/pom.xml b/AxonIvyPortal/portal-components/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portal-components</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>iar</packaging>
   <distributionManagement>
     <repository>

diff --git a/AxonIvyPortal/portal-migration/.project b/AxonIvyPortal/portal-migration/.project
@@ -51,4 +51,4 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
-</projectDescription>
+</projectDescription>
diff --git a/AxonIvyPortal/portal-product/pom.xml b/AxonIvyPortal/portal-product/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portal-product</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <distributionManagement>
     <repository>

diff --git a/AxonIvyPortal/portal-selenium-test/customized_pom.xml b/AxonIvyPortal/portal-selenium-test/customized_pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portal-selenium-test</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
     <build.plugin.version>12.0.0</build.plugin.version>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
     <dependency>

diff --git a/AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml b/AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portal-document-screenshots-selenide</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <properties>
     <build.plugin.version>12.0.0</build.plugin.version>
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
     <dependency>

diff --git a/AxonIvyPortal/portal-selenium-test/pom.xml b/AxonIvyPortal/portal-selenium-test/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portal-selenium-test</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
     <ivy.engine.version>12.0.2</ivy.engine.version>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
   </dependencies>

diff --git a/AxonIvyPortal/portal/pom.xml b/AxonIvyPortal/portal/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portal</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>iar</packaging>
   <distributionManagement>
     <repository>
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal-components</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
   </dependencies>

diff --git a/Documentation/maven/.project b/Documentation/maven/.project
@@ -14,4 +14,4 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
-</projectDescription>
+</projectDescription>
diff --git a/Documentation/maven/pom.xml b/Documentation/maven/pom.xml
@@ -7,7 +7,7 @@
     <version>${revision}</version>
 
     <properties>
-        <revision>9.1.0.0-SNAPSHOT</revision>
+        <revision>12.0.2-SNAPSHOT</revision>
     </properties>
 
     <distributionManagement>

diff --git a/Documentation/portal-guide/.project b/Documentation/portal-guide/.project
@@ -25,4 +25,4 @@
 			</matcher>
 		</filter>
 	</filteredResources>
-</projectDescription>
+</projectDescription>
diff --git a/Documentation/public-api/.project b/Documentation/public-api/.project
@@ -4,4 +4,4 @@
 	<comment></comment>
 	<projects>
 	</projects>
-</projectDescription>
+</projectDescription>
diff --git a/Documentation/public-api/pom.xml b/Documentation/public-api/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>public-api</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <properties>
     <build.plugin.version>12.0.0</build.plugin.version>
     <ivy.engine.version>12.0.0</ivy.engine.version>

diff --git a/Showcase/InternalSupport/pom.xml b/Showcase/InternalSupport/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>internalSupport</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
     <build.plugin.version>12.0.0</build.plugin.version>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal-developer-examples</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
   </dependencies>

diff --git a/Showcase/portal-components-examples/pom.xml b/Showcase/portal-components-examples/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portal-components-examples</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>iar</packaging>
   <distributionManagement>
     <repository>
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal-components</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
   </dependencies>

diff --git a/Showcase/portal-demo-app/.project b/Showcase/portal-demo-app/.project
@@ -14,4 +14,4 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
-</projectDescription>
+</projectDescription>
diff --git a/Showcase/portal-demo-app/pom.xml b/Showcase/portal-demo-app/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portal-demo-app</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <distributionManagement>
     <repository>
@@ -27,13 +27,13 @@
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal-user-examples</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
   </dependencies>

diff --git a/Showcase/portal-developer-examples/pom.xml b/Showcase/portal-developer-examples/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portal-developer-examples</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>iar</packaging>
   <distributionManagement>
     <repository>
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal-components</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
   </dependencies>

diff --git a/Showcase/portal-user-examples/pom.xml b/Showcase/portal-user-examples/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>portal-user-examples</artifactId>
-  <version>9.1.0.0-SNAPSHOT</version>
+  <version>12.0.2-SNAPSHOT</version>
   <packaging>iar</packaging>
   <distributionManagement>
     <repository>
@@ -25,7 +25,7 @@
   <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal-components</artifactId>
-      <version>9.1.0.0-SNAPSHOT</version>
+      <version>12.0.2-SNAPSHOT</version>
       <type>iar</type>
     </dependency>
   </dependencies>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"