Skip to content

Commit

Permalink
IVYPORTAL-18067 Create Portal branch release/12.0
Browse files Browse the repository at this point in the history 
- Adapt for master branch
- Updated version of build plugin version and engine version
  • Loading branch information
@mnhnam-axonivy
mnhnam-axonivy committed Dec 10, 2024
1 parent 8732522 commit 5d9c312
Show file tree
Hide file tree
Showing 22 changed files with 61 additions and 61 deletions.
6 changes: 3 additions & 3 deletions AxonIvyPortal/PortalApp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>13.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<distributionManagement>
<repository>
Expand All @@ -27,13 +27,13 @@
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal-components</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions AxonIvyPortal/PortalKitTestHelper/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.portal</groupId>
<artifactId>portalKitTestHelper</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<ivy.engine.version>12.0.1</ivy.engine.version>
<build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>13.1.0</ivy.engine.version>
<build.plugin.version>13.1.0-SNAPSHOT</build.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions AxonIvyPortal/portal-components/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>13.0.1-SNAPSHOT</version>
<packaging>iar</packaging>
<distributionManagement>
<repository>
Expand All @@ -16,8 +16,8 @@
</snapshotRepository>
</distributionManagement>
<properties>
<ivy.engine.version>12.0.1</ivy.engine.version>
<build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>13.1.0</ivy.engine.version>
<build.plugin.version>13.1.0-SNAPSHOT</build.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions AxonIvyPortal/portal-migration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<version>9.4.0</version>
<packaging>iar</packaging>
<properties>
<ivy.engine.version>12.0.1</ivy.engine.version>
<build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>13.1.0</ivy.engine.version>
<build.plugin.version>13.1.0-SNAPSHOT</build.plugin.version>
</properties>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion AxonIvyPortal/portal-product/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>13.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<distributionManagement>
<repository>
Expand Down
8 changes: 4 additions & 4 deletions AxonIvyPortal/portal-selenium-test/customized_pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal-selenium-test</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>12.0.1</ivy.engine.version>
<build.plugin.version>13.1.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>13.1.0</ivy.engine.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal-document-screenshots-selenide</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>12.0.1</ivy.engine.version>
<build.plugin.version>13.1.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>13.1.0</ivy.engine.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<distributionManagement>
Expand All @@ -24,7 +24,7 @@
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions AxonIvyPortal/portal-selenium-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal-selenium-test</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<ivy.engine.version>12.0.1</ivy.engine.version>
<build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>13.1.0</ivy.engine.version>
<build.plugin.version>13.1.0-SNAPSHOT</build.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
Expand All @@ -21,7 +21,7 @@
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions AxonIvyPortal/portal/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>13.0.1-SNAPSHOT</version>
<packaging>iar</packaging>
<distributionManagement>
<repository>
Expand All @@ -17,15 +17,15 @@
</snapshotRepository>
</distributionManagement>
<properties>
<ivy.engine.version>12.0.1</ivy.engine.version>
<build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>13.1.0</ivy.engine.version>
<build.plugin.version>13.1.0-SNAPSHOT</build.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal-components</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/maven/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<version>${revision}</version>

<properties>
<revision>9.1.0.0-SNAPSHOT</revision>
<revision>13.0.1-SNAPSHOT</revision>
</properties>

<distributionManagement>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/public-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>13.0.1-SNAPSHOT</version>
<properties>
<build.plugin.version>12.0.0</build.plugin.version>
<ivy.engine.version>12.0.0</ivy.engine.version>
Expand Down
8 changes: 4 additions & 4 deletions Showcase/InternalSupport/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.portal</groupId>
<artifactId>internalSupport</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>12.0.1</ivy.engine.version>
<build.plugin.version>13.1.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>13.1.0</ivy.engine.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal-developer-examples</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions Showcase/portal-components-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>13.0.1-SNAPSHOT</version>
<packaging>iar</packaging>
<distributionManagement>
<repository>
Expand All @@ -17,15 +17,15 @@
</snapshotRepository>
</distributionManagement>
<properties>
<ivy.engine.version>12.0.1</ivy.engine.version>
<build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>13.1.0</ivy.engine.version>
<build.plugin.version>13.1.0-SNAPSHOT</build.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal-components</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions Showcase/portal-demo-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>13.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<distributionManagement>
<repository>
Expand All @@ -27,13 +27,13 @@
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal-user-examples</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions Showcase/portal-developer-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>13.0.1-SNAPSHOT</version>
<packaging>iar</packaging>
<distributionManagement>
<repository>
Expand All @@ -17,15 +17,15 @@
</snapshotRepository>
</distributionManagement>
<properties>
<ivy.engine.version>12.0.1</ivy.engine.version>
<build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>13.1.0</ivy.engine.version>
<build.plugin.version>13.1.0-SNAPSHOT</build.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal-components</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions Showcase/portal-user-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>13.0.1-SNAPSHOT</version>
<packaging>iar</packaging>
<distributionManagement>
<repository>
Expand All @@ -17,15 +17,15 @@
</snapshotRepository>
</distributionManagement>
<properties>
<ivy.engine.version>12.0.1</ivy.engine.version>
<build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>13.1.0</ivy.engine.version>
<build.plugin.version>13.1.0-SNAPSHOT</build.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.axonivy.portal</groupId>
<artifactId>portal-components</artifactId>
<version>9.1.0.0-SNAPSHOT</version>
<version>13.0.1-SNAPSHOT</version>
<type>iar</type>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion build/create-release/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,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.
string(name: 'engineDownloadURL', defaultValue: '-Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly/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=file:///C:/wawa/engine/AxonIvyEngineX.X.X.X_Windows_x64.zip for downloaded engine
Expand Down
8 changes: 4 additions & 4 deletions build/document-screenshot-selenide/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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.
string(name: 'engineDownloadURL', defaultValue: '-Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly/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=file:///C:/wawa/engine/AxonIvyEngineX.X.X.X_Windows_x64.zip for downloaded engine
Expand Down Expand Up @@ -90,9 +90,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) {
Expand All @@ -109,7 +109,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'
}
}
Expand Down
2 changes: 1 addition & 1 deletion build/gui-test-new-dashboard/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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.
string(name: 'engineDownloadURL', defaultValue: '-Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly/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=file:///C:/wawa/engine/AxonIvyEngineX.X.X.X_Windows_x64.zip for downloaded engine
Expand Down
2 changes: 1 addition & 1 deletion build/integration/Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,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.
string(name: 'engineDownloadURL', defaultValue: '-Divy.engine.download.url=https://developer.axonivy.com/permalink/nightly/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=file:///C:/wawa/engine/AxonIvyEngineX.X.X.X_Windows_x64.zip for downloaded engine
Expand Down
Loading

0 comments on commit 5d9c312

Please sign in to comment.