diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bc3496..23a45bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,4 +9,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v2 + uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v3 diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index a27a639..63dfa89 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -8,4 +8,6 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v2 + uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v3 + with: + mvnArgs: '-Dportal.version=11.4.0-m261' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 128a183..8426107 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,4 +4,4 @@ on: workflow_dispatch jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/release.yml@v2 + uses: axonivy-market/github-workflows/.github/workflows/release.yml@v3 diff --git a/axonivy-express-product/pom.xml b/axonivy-express-product/pom.xml index ff7786a..9a76d27 100644 --- a/axonivy-express-product/pom.xml +++ b/axonivy-express-product/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.axonivy.portal axonivy-express-product - 11.1.2-SNAPSHOT + 11.3.0-SNAPSHOT pom diff --git a/axonivy-express/.project b/axonivy-express/.project index 2bbecde..34734cf 100644 --- a/axonivy-express/.project +++ b/axonivy-express/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder diff --git a/axonivy-express/.settings/ch.ivyteam.ivy.designer.prefs b/axonivy-express/.settings/ch.ivyteam.ivy.designer.prefs index d218da1..ef41958 100644 --- a/axonivy-express/.settings/ch.ivyteam.ivy.designer.prefs +++ b/axonivy-express/.settings/ch.ivyteam.ivy.designer.prefs @@ -13,5 +13,5 @@ ch.ivyteam.ivy.designer.preferences.ProcessEnginePreferencePage\:START_ENGINES_O ch.ivyteam.ivy.designer.preferences.ProcessEnginePreferencePage\:useProjectSettings=true ch.ivyteam.ivy.project.preferences\:PORTAL_VERSION=10 ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=112100 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000 eclipse.preferences.version=1 diff --git a/axonivy-express/pom.xml b/axonivy-express/pom.xml index 5785231..e065c4e 100644 --- a/axonivy-express/pom.xml +++ b/axonivy-express/pom.xml @@ -3,17 +3,16 @@ 4.0.0 com.axonivy.portal axonivy-express - 11.1.2-SNAPSHOT + 11.3.0-SNAPSHOT iar - 11.3.0 - 11.2.0 + 11.3.0 com.axonivy.portal portal - 11.2.0 + 11.3.1 iar @@ -24,12 +23,21 @@ https://maven.axonivy.com/ + + + sonatype + https://oss.sonatype.org/content/repositories/snapshots + + always + + + com.axonivy.ivy.ci project-build-plugin - ${build.plugin.version} + ${project.build.plugin.version} true false diff --git a/pom.xml b/pom.xml index abfa84a..9176e2d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.axonivy.portal axonivy-express axonivy-express-modules - 11.1.2-SNAPSHOT + 11.3.0-SNAPSHOT pom